Opti algo solution improvement (#83)

* Opti algo takes more time to find better solutions
mj-xmr · Jul 22, 2022 · 3f4f1f0 · 3f4f1f0
1 parent 6f69400
commit 3f4f1f0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/opti-lib/src/OptiEnProfitSubject.cpp b/src/opti-lib/src/OptiEnProfitSubject.cpp
@@ -189,13 +189,14 @@ double OptiSubjectEnProfit::GetVerbose(const EnjoLib::Matrix & dataMat, bool ver
         {
             if  (LOG_UNACCEPTABLE_SOLUTIONS)
             {
-                LOGL << "Unacceptable solution. Penality undervolt = " << pentalityUndervolted << " Overvolt: " << pentalityOvervolted << "\n";
+                LOGL << "Unacceptable solution. Penality undervolt = " << pentalityUndervolted << " Overvolt: " << pentalityOvervolted
+                 << ", hashes = " << resLocal.sumHashes << "\n";
             }
             const double penality = penalitySum * PENALITY_SUM_MUL;
             const double penalityExtrapolated = penality * (n - i) * 3; // Extrapolate across the remaining simulation steps
             if (not verbose)
             {
-                return -penalityExtrapolated;
+                return resLocal.sumHashes -penalityExtrapolated;
             }
         }
         //LOGL << "acceptable solution. Penality undervolt = " << pentalityUndervolted << " Overvolt: " << pentalityOvervolted << "\n";

diff --git a/src/opti-lib/src/OptimizerEnProfit.cpp b/src/opti-lib/src/OptimizerEnProfit.cpp
@@ -38,7 +38,8 @@ using namespace std;
 using namespace EnjoLib;
 
 const int OptimizerEnProfit::HOURS_IN_DAY = 24;
-const int OptimizerEnProfit::MAX_FAILED_COMBINATIONS = 600000;
+const int OptimizerEnProfit::MAX_NUM_COMBINATIONS = 1e7;
+const double OptimizerEnProfit::MAX_FAILED_COMBINATIONS = 0.6;
 const double OptimizerEnProfit::MIN_POS_2_NEG_CHANGE_RATIO = 0.01;
 
 OptimizerEnProfit::OptimizerEnProfit(const OptiEnProfitDataModel & dataModel)
@@ -96,18 +97,18 @@ void OptimizerEnProfit::RandomSearch()
     Matrix binarBest = binaryMat;
 
     const bool useHash = IsUseHash();
-    const int maxEl = 1e7;
+    const int maxCombisFailed = MAX_NUM_COMBINATIONS * MAX_FAILED_COMBINATIONS;
     short bit = 1;
     char bitC = '1';
     std::set<std::string> usedCombinations;
     int alreadyCombined = 0;
     const GMat gmat;
     ProgressMonitHigh progressMonitor;
-    for (int i = 0; i < maxEl; ++i)
+    for (int i = 0; i < MAX_NUM_COMBINATIONS; ++i)
     {
         if (i % 100000 == 0)
         {
-            progressMonitor.PrintProgressBarTime(i, maxEl);
+            progressMonitor.PrintProgressBarTime(i, MAX_NUM_COMBINATIONS);
         }
         const int icomp = gmat.round(rmath.Rand(0, numComputers-1));
         //for (int icomp = 0; icomp < numComputers; ++icomp)
@@ -177,17 +178,16 @@ void OptimizerEnProfit::RandomSearch()
             }
             RecalcComputationCosts();
         }
-        const int maxFail = MAX_FAILED_COMBINATIONS;
         const bool changeLargeEnough = m_relPos2Neg == 0 || m_relPos2Neg > MIN_POS_2_NEG_CHANGE_RATIO;
-        const bool exceededNumFailed = m_numFailed >= maxFail;
+        const bool exceededNumFailed = m_numFailed >= maxCombisFailed;
         //if (exceededNumFailed && not changeLargeEnough)
         if (exceededNumFailed)
         {
             LOGL << "Early stop after " << m_numFailed << " last failed attempts "
                  // << and last change of " << m_relPos2Neg << " < " << MIN_POS_2_NEG_CHANGE_RATIO << Nl
                  << Nl
-                 << "Repeated combinations = " << alreadyCombined << " of " << maxFail << ": " << GMat().round(alreadyCombined/double(maxFail) * 100) << "%" << Nl
-                 << "Unique   combinations = " << usedCombinations.size() << " of " << maxFail << ": " << GMat().round(usedCombinations.size()/double(maxFail) * 100) << "%" << Nl;
+                 << "Repeated combinations = " << alreadyCombined << " of " << maxCombisFailed << ": " << GMat().round(alreadyCombined/double(maxCombisFailed) * 100) << "%" << Nl
+                 << "Unique   combinations = " << usedCombinations.size() << " of " << maxCombisFailed << ": " << GMat().round(usedCombinations.size()/double(maxCombisFailed) * 100) << "%" << Nl;
             break;
         }
     }

diff --git a/src/opti-lib/src/OptimizerEnProfit.h b/src/opti-lib/src/OptimizerEnProfit.h
@@ -35,7 +35,8 @@ class OptimizerEnProfit : public EnjoLib::IMultiDimIterConsumerTpl //OptimizerBa
         bool IsUseHash() const;
 
         const int static HOURS_IN_DAY;
-        const int static MAX_FAILED_COMBINATIONS;
+        const int static MAX_NUM_COMBINATIONS;
+        const double static MAX_FAILED_COMBINATIONS;
         const double static MIN_POS_2_NEG_CHANGE_RATIO;
 
     protected:

diff --git a/src/system-cfg/computers-template.json b/src/system-cfg/computers-template.json
@@ -2,7 +2,7 @@
     "computers": [
     	  {
     	  	"name" : "Fanless Intel, 4 core",
-    	  	"count" : 0,
+    	  	"count" : 1,
     	  	"cores" : 4,
     	  	"hash_per_core" : 250,
     	  	"watt_per_core" : 11.5,
@@ -13,7 +13,8 @@
     	  },
     	  {
     	  	"name" : "Fanless Ryzen, 2 core",
-    	  	"cores" : 1,
+    	  	"count" : 0,
+    	  	"cores" : 2,
     	  	"hash_per_core" : 100,
     	  	"watt_per_core" : 20,
     	  	"watt_idle" : 8,
@@ -23,6 +24,7 @@
     	  },
     	  {
     	  	"name" : "Ryzen 7, 8 cores",
+    	  	"count" : 1,
     	  	"cores" : 8,
     	  	"hash_per_core" : 400,
     	  	"watt_per_core" : 8,