Edupack improved

.gitignore

@@ -35,4 +35,6 @@ Makefile
 extern/
 assets/
 test/extern
-test/assets
+test/assets
+edupack/bin/*
+*.lock

bsp/include/bsp/historyRecorder.h

@@ -391,9 +391,10 @@ class HistoryRecorder
         PlotWidthBars( plot );
         plot.Figure();
         PlotRatio( plot );
-        // plot.Figure();
+		//enabling this will result in an extra empty plot
+        //plot.Figure();
         PlotMatrices( plot );
-        plot.Show();
+		plot.Show();
     }
 
 private:
@@ -430,7 +431,7 @@ class HistoryRecorder
             return std::to_string( i ) + " Compute";
         };
 
-        EasyPlot::BackgroundForegroundBarPlot( plot, mSyncTimes, mComputeTimes, mSuperstepIndices, backPalette, forePalette,
+        EasyPlot::BackgroundForegroundBarPlot( plot, ToPVecVec(mSyncTimes), ToPVecVec(mComputeTimes), ToPVecVec(mSuperstepIndices), backPalette, forePalette,
                                                backHue,
                                                foreHue );
         plot.SetXLabel( "Superstep (grouped)" ).SetYLabel( "Time (s)" );
@@ -449,11 +450,11 @@ class HistoryRecorder
         };
 
         plot.SubPlot( 1, 2, 1 );
-        EasyPlot::StackedBarPlot( plot, mSuperstepIndices, mMaxSizes, palette, hueFunc );
+        EasyPlot::StackedBarPlot( plot, ToPVecVec(mSuperstepIndices), ToPVecVec(mMaxSizes), palette, hueFunc );
         plot.SetXLabel( "Superstep (grouped)" ).SetYLabel( "Bytes communicated = max(send, receive)" );
 
         plot.SubPlot( 1, 2, 2 );
-        EasyPlot::StackedBarPlot( plot, mSuperstepIndices, mMaxCounts, palette, hueFunc );
+        EasyPlot::StackedBarPlot( plot, ToPVecVec(mSuperstepIndices), ToPVecVec(mMaxCounts), palette, hueFunc );
         plot.SetXLabel( "Superstep (grouped)" ).SetYLabel( "Messages communicated = max(send, receive)" );
 
         plot.SetSupTitle( "#communications, grouped by superstep number" );
@@ -471,11 +472,11 @@ class HistoryRecorder
         };
 
         plot.SubPlot( 1, 2, 1 );
-        EasyPlot::StackedDistancedBarPlot( plot, mComputeTimes, mSyncTimes, mMaxSizes, palette, hueFunc );
+        EasyPlot::StackedDistancedBarPlot( plot, ToPVecVec(mComputeTimes), ToPVecVec(mSyncTimes), ToPVecVec(mMaxSizes), palette, hueFunc );
         plot.SetXLabel( "Time (s)" ).SetYLabel( "Bytes communicated = max(send, receive)" );
 
         plot.SubPlot( 1, 2, 2 );
-        EasyPlot::StackedDistancedBarPlot( plot, mComputeTimes, mSyncTimes, mMaxCounts, palette, hueFunc );
+        EasyPlot::StackedDistancedBarPlot( plot, ToPVecVec(mComputeTimes), ToPVecVec(mSyncTimes), ToPVecVec(mMaxCounts), palette, hueFunc );
         plot.SetXLabel( "Time (s)" ).SetYLabel( "Messages communicated = max(send, receive)" );
 
         plot.SetSupTitle( "#communications, width represents time" );
@@ -513,7 +514,7 @@ class HistoryRecorder
 
         plot.SetLegend( hueData, hueFunc );
         plot.SetXLabel( "Superstep" ).SetYLabel( "comp/(comm + sync)" );
-        plot.SetYScale( SymLogScale().SetLinScaleY(0.0,1.0) );
+		plot.SetYScale(SymLogScale());
         plot.SetTitle( "Ratio comp/(comm + sync) per superstep" );
         plot.SetSize( 1050, 400 );
     }
@@ -570,6 +571,16 @@ class HistoryRecorder
         plot.SetSupTitle( "#communications from processor left to processor bottom" );
         plot.SetSize( 840, 600 );
     }
+
+	static std::vector<PVec> ToPVecVec(const std::vector<std::vector<double>> &v)
+    {
+		std::vector<PVec> s;
+		for (const auto &c : v)
+		{
+			s.emplace_back(PVec(c));
+		}
+		return s;
+    }
 };
 #endif
 

edupack/.package.json

@@ -0,0 +1,8 @@
+{
+    "requires": [
+        {
+            "name": "Zefiros-Software/BSPLib",
+            "path": "../"
+        }
+    ]
+}

edupack/bspbench.cpp

@@ -1,5 +1,4 @@
 #include "bspedupack.h"
-#include "config.h"
 
 #include <numeric>
 

edupack/bspedupack.h

@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
+
 #include "bsp/bsp.h"
 
 #define SZDBL (sizeof(double))