Ticket #2025: pathfind_test_banch_vanilla_update.patch

source/simulation2/components/tests/test_Pathfinder.h

@@ -68 +68 @@
         CMapReader* mapReader = new CMapReader(); // it'll call "delete this" itself
 
         LDR_BeginRegistering();
-        mapReader->LoadMap(L"maps/scenarios/Median Oasis.pmp", &terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+        mapReader->LoadMap(L"maps/scenarios/Median Oasis 01.pmp", &terrain, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
             &sim2, &sim2.GetSimContext(), -1, false);
         LDR_EndRegistering();
         TS_ASSERT_OK(LDR_NonprogressiveLoad());
@@ -90 +90 @@
             printf("%d: %f %f\n", (int)i, path.m_Waypoints[i].x.ToDouble(), path.m_Waypoints[i].z.ToDouble());
 #endif
 
-        double t = timer_Time();
 
         srand(1234);
+
+        std::vector<ICmpPathfinder::Goal> goals;
+
+        std::vector<entity_pos_t> x0s;
+        std::vector<entity_pos_t> z0s;
         for (size_t j = 0; j < 1024*2; ++j)
         {
             entity_pos_t x0 = entity_pos_t::FromInt(rand() % 512);
@@ -100 +104 @@
             entity_pos_t x1 = x0 + entity_pos_t::FromInt(rand() % 64);
             entity_pos_t z1 = z0 + entity_pos_t::FromInt(rand() % 64);
             ICmpPathfinder::Goal goal = { ICmpPathfinder::Goal::POINT, x1, z1 };
+            x0s.push_back(x0);
+            z0s.push_back(z0);
+            goals.push_back(goal);
+        }
 
-            ICmpPathfinder::Path path;
-            cmp->ComputePath(x0, z0, goal, cmp->GetPassabilityClass("default"), cmp->GetCostClass("default"), path);
+        double t = timer_Time();
+
+        
+        ICmpPathfinder::Path path;
+        for (size_t j = 0; j < 1024*2; ++j)
+        {
+            cmp->ComputePath(x0s[j], z0s[j], goals[j], cmp->GetPassabilityClass("default"), cmp->GetCostClass("default"), path);
         }
 
         t = timer_Time() - t;
-        printf("[%f]", t);
+        printf("\nTestCmpPathfinder ComputePath[%f]", t);
     }
 
     void test_performance_short_DISABLED()
@@ -124 +137 @@
         CmpPtr<ICmpPathfinder> cmpPathfinder(sim2, SYSTEM_ENTITY);
 
         srand(0);
+
         for (size_t i = 0; i < 200; ++i)
         {
             fixed x = fixed::FromFloat(1.5f*range.ToFloat() * rand()/(float)RAND_MAX);
@@ -131 +145 @@
 //          printf("# %f %f\n", x.ToFloat(), z.ToFloat());
             cmpObstructionMan->AddUnitShape(INVALID_ENTITY, x, z, fixed::FromInt(2), 0, INVALID_ENTITY);
         }
+            
+        double t = timer_Time();
 
-        NullObstructionFilter filter;
-        ICmpPathfinder::Goal goal = { ICmpPathfinder::Goal::POINT, range, range };
-        ICmpPathfinder::Path path;
-        cmpPathfinder->ComputeShortPath(filter, range/3, range/3, fixed::FromInt(2), range, goal, 0, path);
-        for (size_t i = 0; i < path.m_Waypoints.size(); ++i)
-            printf("# %d: %f %f\n", (int)i, path.m_Waypoints[i].x.ToFloat(), path.m_Waypoints[i].z.ToFloat());
+        for (size_t j = 0; j < 1024*2; ++j)
+        {
+
+            NullObstructionFilter filter;
+            ICmpPathfinder::Goal goal = { ICmpPathfinder::Goal::POINT, range, range };
+            ICmpPathfinder::Path path;
+
+            cmpPathfinder->ComputeShortPath(filter, range/3, range/3, fixed::FromInt(2), range, goal, 0, path);
+        }
+            
+        t = timer_Time() - t;
+        
+        printf("\nTestCmpPathfinder ComputeShortPath[%f]\n", t);
+        {
+            NullObstructionFilter filter;
+            ICmpPathfinder::Goal goal = { ICmpPathfinder::Goal::POINT, range, range };
+            ICmpPathfinder::Path path;
+
+            cmpPathfinder->ComputeShortPath(filter, range/3, range/3, fixed::FromInt(2), range, goal, 0, path);
+                for (size_t i = 0; i < path.m_Waypoints.size(); ++i)
+                    printf("# %d: %f %f\n", (int)i, path.m_Waypoints[i].x.ToFloat(), path.m_Waypoints[i].z.ToFloat());
+        }
     }
 };