minor corrections to CLI

chrxh · Sep 21, 2023 · 6389f97 · 6389f97
1 parent 978df20
commit 6389f97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/source/Cli/Main.cpp b/source/Cli/Main.cpp
@@ -27,6 +27,7 @@ namespace
                 file << ", " << name << " (color " << i << ")";
             }
         };
+        file << "Time step";
         writeLabelAllColors("Cells");
         writeLabelAllColors("Self-replicators");
         writeLabelAllColors("Viruses");
@@ -59,9 +60,10 @@ namespace
         };
         auto writeFloatValueAllColors = [&file](ColorVector<float> const& values) {
             for (int i = 0; i < MAX_COLORS; ++i) {
-                file << ", " << StringHelper::format(values[i], 8);
+                file << ", " << values[i];
             }
         };
+        file << simController->getCurrentTimestep();
         writeIntValueAllColors(statistics.timeline.timestep.numCells);
         writeIntValueAllColors(statistics.timeline.timestep.numSelfReplicators);
         writeIntValueAllColors(statistics.timeline.timestep.numViruses);
@@ -122,7 +124,7 @@ int main(int argc, char** argv)
         simController->newSimulation(simData.auxiliaryData.timestep, simData.auxiliaryData.generalSettings, simData.auxiliaryData.simulationParameters);
         simController->setClusteredSimulationData(simData.mainData);
 
-        std::cout << "Use " << simController->getGpuName() << std::endl;
+        std::cout << "Device: " << simController->getGpuName() << std::endl;
         std::cout << "Start simulation" << std::endl;
         simController->calcTimesteps(timesteps);
         auto ms = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::steady_clock::now() - startTimepoint).count();

diff --git a/source/Gui/StatisticsWindow.cpp b/source/Gui/StatisticsWindow.cpp
@@ -519,7 +519,7 @@ void _StatisticsWindow::onSaveStatistics()
                 return;
             }
 
-            file << "time step";
+            file << "Time step";
             auto writeLabelAllColors = [&file](auto const& name) {
                 for (int i = 0; i < MAX_COLORS; ++i) {
                     file << ", " << name << " (color " << i << ")";
@@ -552,7 +552,7 @@ void _StatisticsWindow::onSaveStatistics()
             };
             auto writeDoubleValueAllColors = [&file](DataPoint const& dataPoint) {
                 for (int i = 0; i < MAX_COLORS; ++i) {
-                    file << ", " << StringHelper::format(toFloat(dataPoint.values[i]), 8);
+                    file << ", " << dataPoint.values[i];
                 }
             };
             for (auto const& dataPointCollection : _longtermStatistics.dataPointCollectionHistory) {