safety tweaks

lshoek · Aug 19, 2020 · 41711bf · 41711bf
1 parent 35822fb
commit 41711bf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/Artifact/AestheticEvaluator.cpp b/src/Artifact/AestheticEvaluator.cpp
@@ -113,6 +113,14 @@ std::vector<double> AestheticEvaluator::evaluate(cv::Mat im)
 		if (!isnan(result)) {
 			aestheticReward = result;
 		}
+		else {
+			// for safety
+			IC = 0.0;
+			PC = 0.0;
+			PCt0 = 0.0;
+			PCt1 = 0.0;
+			PCdiffRaw = 0.0;
+		}
 	}
 
 	// Make aesthetic reward partly proportional to the coverage reward to prevent high rewards for low coverage artifacts

diff --git a/src/Simulator/SimulationManager.cpp b/src/Simulator/SimulationManager.cpp
@@ -165,6 +165,7 @@ void SimulationManager::startSimulation()
             if (!bHasSimulationId) {
                 _uniqueSimId = info.ga_id;
                 _simDir = NTRS_SIMS_DIR + '/' + _uniqueSimId + '/';
+                bHasSimulationId = true;
                 ofLog() << ">> Simulation ID: " << _uniqueSimId;
             }
             else if (_uniqueSimId != info.ga_id) {

diff --git a/src/ofApp.cpp b/src/ofApp.cpp
@@ -261,6 +261,9 @@ void ofApp::imGui()
 			if (ImGui::Begin("Overlay", NULL, flags | ImGuiWindowFlags_NoScrollbar)) {
 				ImGui::Text("Meta");
 				ImGui::Separator();
+				if (simulationManager.isInitialized()) {
+					ImGui::Text(&simulationManager.getUniqueSimId()[0]);
+				}
 				ImGui::Dummy(margin);
 
 				glm::vec3 cpos = simulationManager.getCamera()->getPosition();