ASCII plots more colorful + distribution of solutions (#102)

mj-xmr · Aug 11, 2022 · 79489f4 · 79489f4
1 parent 432488d
commit 79489f4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/externals/tsqsim b/externals/tsqsim
diff --git a/src/opti-lib/src/OptiEnProfitResults.cpp b/src/opti-lib/src/OptiEnProfitResults.cpp
@@ -19,6 +19,7 @@ using namespace EnjoLib;
 /// TODO: UTest & refactor
 void OptimizerEnProfit::PrintSolution(const EnjoLib::Matrix & bestMat) const
 {
+    ELO
     const int currHour = TimeUtil().GetCurrentHour();
     OptiSubjectEnProfit osub(m_dataModel);
     osub.GetVerbose(bestMat, true);
@@ -31,10 +32,12 @@ void OptimizerEnProfit::PrintSolution(const EnjoLib::Matrix & bestMat) const
     const DistribData & distribDat = distr.GetDistrib(m_goals);
     if (distribDat.IsValid())
     {
+        const Str & dstr = distr.PlotLine(distribDat, false, true, true);
+        LOG << Nl << "Distribution of solutions:" << Nl<< dstr << Nl;
         //GnuplotPlotTerminal2d(distribDat.data, "Solution distribution", 1, 0.5);
     }
     Str cmds = "";
-    ELO
+
     LOG << "\nComputer start schedule:\n";
     Osstream oss;
     for (int i = 0; i < bestMat.size(); ++i)

diff --git a/src/opti-lib/src/OptiEnProfitSubject.cpp b/src/opti-lib/src/OptiEnProfitSubject.cpp
@@ -286,6 +286,7 @@ double OptiSubjectEnProfit::GetVerbose(const EnjoLib::Matrix & dataMat, bool ver
                     LOG << "Energy input [A] :\n" << AsciiPlot::Build()(Par::MAXIMUM, m_prod.Max()).Finalize().Plot(m_prod) << Nl;
                     LOG << "Bat charge   [Ah]:\n"   << AsciiPlot::Build()(Par::MAXIMUM, batteryCopy.m_maxCapacityAmph)
                     (Par::MINIMUM, m_dataModel.GetBatPars().MIN_LOAD_AMPH)(Par::COLORS, true)
+                    (Par::MULTILINE, true)
                     .Finalize().Plot(m_loads) << Nl;
                     LOG << "Total usage  [A] :\n"   << AsciiPlot::Build()(Par::MAXIMUM, batteryCopy.pars.MAX_DISCHARGE_AMP)
                     (Par::COLORS, true)

diff --git a/src/opti-lib/src/OptimizerEnProfit.cpp b/src/opti-lib/src/OptimizerEnProfit.cpp
@@ -17,6 +17,7 @@
 #include "TimeUtil.h"
 
 #include <Math/GeneralMath.hpp>
+#include <Math/RandomMath.hpp>
 #include <Util/ProgressMonit.hpp>
 #include <Util/ProgressMonitHigh.hpp>
 #include <Util/CharManipulations.hpp>
@@ -27,9 +28,7 @@
 #include <Statistical/Statistical.hpp>
 #include <Statistical/Distrib.hpp>
 #include <Template/CorradePointer.h>
-
-#include <Math/RandomMath.hpp>
-#include <Math/GeneralMath.hpp>
+#include <Visual/AsciiPlot.hpp>
 
 #include <STD/VectorCpp.hpp>
 #include <STD/Set.hpp>
@@ -105,12 +104,19 @@ void OptimizerEnProfit::RandomSearch()
     std::set<std::string> usedCombinations;
     int alreadyCombined = 0;
     const GMat gmat;
-    ProgressMonitHigh progressMonitor;
+    //const Distrib distr;
+    ProgressMonitHigh progressMonitor(20);
     for (int i = 0; i < MAX_NUM_COMBINATIONS; ++i)
     {
         if (i % 100000 == 0)
         {
-            progressMonitor.PrintProgressBarTime(i, MAX_NUM_COMBINATIONS);
+            progressMonitor.PrintProgressBarTime(i, MAX_NUM_COMBINATIONS, "Solutions");
+            //if (i > 0)
+            {
+            //const DistribData & data = distr.GetDistrib(m_goals, 20); const Str & dstr = distr.PlotLine(data, true, true, true);
+            //progressMonitor.PrintProgressBarTime(i, MAX_NUM_COMBINATIONS, dstr);    
+            }
+
         }
         const int icomp = gmat.round(rmath.Rand(0, numComputers-1));
         //for (int icomp = 0; icomp < numComputers; ++icomp)