Add low level expansion/generation rate, and add all rates to A_RunMa…

…nager output ("log" files)
J-morag · Oct 21, 2024 · 7043080 · 7043080
1 parent 34aa82c
commit 7043080
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/main/java/BasicMAPF/Solvers/A_Solver.java b/src/main/java/BasicMAPF/Solvers/A_Solver.java
@@ -145,7 +145,9 @@ protected void writeMetricsToReport(Solution solution){
             instanceReport.putIntegerValue(InstanceReport.StandardFields.solved, 0);
         }
         instanceReport.putIntegerValue(InstanceReport.StandardFields.generatedNodesLowLevel, this.totalLowLevelNodesGenerated);
+        instanceReport.putFloatValue(InstanceReport.StandardFields.generationRateLowLevel,(float) this.totalLowLevelNodesGenerated / ((float) (elapsedTime) / 1000f));
         instanceReport.putIntegerValue(InstanceReport.StandardFields.expandedNodesLowLevel, this.totalLowLevelNodesExpanded);
+        instanceReport.putFloatValue(InstanceReport.StandardFields.expansionRateLowLevel, (float) this.totalLowLevelNodesExpanded / ((float) (elapsedTime) / 1000f));
         instanceReport.putIntegerValue(InstanceReport.StandardFields.totalLowLevelTimeMS, this.totalLowLevelTimeMS);
         instanceReport.putIntegerValue(InstanceReport.StandardFields.totalLowLevelCalls, this.totalLowLevelCalls);
     }

diff --git a/src/main/java/Environment/RunManagers/A_RunManager.java b/src/main/java/Environment/RunManagers/A_RunManager.java
@@ -121,7 +121,13 @@ protected void setOutputStreamsBeforeRunning() {
                     MakespanServiceTime.NAME,
                     MakespanServiceTime.NAME,
                     InstanceReport.StandardFields.expandedNodes,
+                    InstanceReport.StandardFields.expansionRate,
                     InstanceReport.StandardFields.generatedNodes,
+                    InstanceReport.StandardFields.generationRate,
+                    InstanceReport.StandardFields.expandedNodesLowLevel,
+                    InstanceReport.StandardFields.expansionRateLowLevel,
+                    InstanceReport.StandardFields.generatedNodesLowLevel,
+                    InstanceReport.StandardFields.generationRateLowLevel,
                     InstanceReport.StandardFields.startDateTime,
                     InstanceReport.StandardFields.processorInfo,
             });