Merge branch 'master' into refactorRenderingModule

Source/CollisionDetection/Testing/imstkTetraToTetraCDTest.cpp

@@ -105,7 +105,7 @@ TEST_F(imstkTetraToTetraCDTest, IntersectionThenNoIntersection1T)
     EXPECT_EQ(cd->PTColData.getSize(), 0);
 }
 
-TEST_F(imstkTetraToTetraCDTest, IntersectionThenNoIntersectionHuman)
+TEST_F(imstkTetraToTetraCDTest, DISABLED_IntersectionThenNoIntersectionHuman)
 {
     std::shared_ptr<TetrahedralMesh> a = loadMesh("/human/human.veg");
     auto                             b = duplicate(a);
@@ -146,7 +146,7 @@ TEST_F(imstkTetraToTetraCDTest, IntersectionThenNoIntersectionHuman)
     EXPECT_EQ(cd->PTColData.getSize(), 0);
 }
 
-TEST_F(imstkTetraToTetraCDTest, IntersectionOfDifferentMeshes)
+TEST_F(imstkTetraToTetraCDTest, DISABLED_IntersectionOfDifferentMeshes)
 {
     std::shared_ptr<TetrahedralMesh> a = loadMesh("/asianDragon/asianDragon.veg");
     std::shared_ptr<TetrahedralMesh> b = loadMesh("/human/human.veg");

Source/Common/TaskGraph/imstkTaskGraph.cpp

@@ -391,7 +391,10 @@ TaskGraph::topologicalSort(std::shared_ptr<TaskGraph> graph)
 
     for (TaskNodeAdjList::const_iterator i = invAdjList.begin(); i != invAdjList.end(); i++)
     {
-        numInputs[i->first] = invAdjList.size();
+        if (invAdjList.count(i->first) != 0)
+        {
+            numInputs[i->first] = invAdjList.at(i->first).size();
+        }
     }
 
     // Create an edge blacklist for edge removal during algorithm

Source/Common/Testing/imstkModuleTest.cpp

@@ -139,7 +139,7 @@ TEST_F(imstkModuleTest, ControlModule)
     ASSERT_TRUE(m_module.m_cleanup);
 
     auto t = std::thread([this] { m_module.start(); });
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Running);
     ASSERT_TRUE(m_module.m_init);
     ASSERT_TRUE(m_module.m_run);
@@ -147,19 +147,19 @@ TEST_F(imstkModuleTest, ControlModule)
     m_module.pause();
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Paused);
     m_module.m_run = false;
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_TRUE(m_module.m_init);
     ASSERT_FALSE(m_module.m_run);
 
     m_module.run();
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Running);
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_TRUE(m_module.m_init);
     ASSERT_TRUE(m_module.m_run);
 
     m_module.end();
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Inactive);
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_TRUE(m_module.m_init);
     ASSERT_TRUE(m_module.m_run);
     ASSERT_TRUE(m_module.m_cleanup);
@@ -168,7 +168,7 @@ TEST_F(imstkModuleTest, ControlModule)
     m_module.m_init = m_module.m_run = m_module.m_cleanup = false;
 
     t = std::thread([this] { m_module.start(); });
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Running);
     ASSERT_TRUE(m_module.m_init);
     ASSERT_TRUE(m_module.m_run);
@@ -177,14 +177,14 @@ TEST_F(imstkModuleTest, ControlModule)
     m_module.pause();
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Paused);
     m_module.m_run = false;
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_TRUE(m_module.m_init);
     ASSERT_FALSE(m_module.m_run);
     ASSERT_FALSE(m_module.m_cleanup);
 
     m_module.end();
     ASSERT_EQ(m_module.getStatus(), ModuleStatus::Inactive);
-    std::this_thread::sleep_for(std::chrono::milliseconds(50));
+    std::this_thread::sleep_for(std::chrono::milliseconds(500));
     ASSERT_TRUE(m_module.m_init);
     ASSERT_FALSE(m_module.m_run);
     ASSERT_TRUE(m_module.m_cleanup);

Source/Scene/imstkScene.cpp

@@ -167,7 +167,6 @@ Scene::initTaskGraph()
     {
         m_taskGraphController = std::make_shared<SequentialTaskGraphController>();
     }
-    m_taskGraphController->setTaskGraph(m_taskGraph);
 
     // Reduce the graph, removing nonfunctional nodes, and redundant edges
     if (m_config->graphReductionEnabled)
@@ -193,6 +192,7 @@ Scene::initTaskGraph()
         writer.write();
     }
 
+    m_taskGraphController->setTaskGraph(m_taskGraph);
     m_taskGraphController->initialize();
 }