Fix hashrate sum (#138)

mj-xmr · Oct 13, 2022 · fff8976 · fff8976
1 parent c3aa7fb
commit fff8976
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/opti-lib/src/OptiEnProfitSubject.cpp b/src/opti-lib/src/OptiEnProfitSubject.cpp
@@ -69,7 +69,7 @@ Solution OptiSubjectEnProfit::GetVerbose(const EnjoLib::Matrix & dataMat, bool v
         //LOG << "i = " << i << ", val = " << inp[i] << Nl;
         //if (not battery.initial_load)
         //if (false)
-        const PowerUsageSimulation::SimResult & resLocal = powSim.Simulate(i, m_currHour, dataMat, bonusMul, battery.initial_load);
+        const PowerUsageSimulation::SimResult & resLocal = powSim.Simulate(i, m_currHour, dataMat, bonusMul, battery.initial_load); // TODO: currently the function assumes a hardcoded 1h time window, needs to be configurable
         simResult.Add(resLocal);
         battery.iter_get_load(powerProd, resLocal.sumPowerUsage);
         //const double pentalityUndervolted = load < 0 ? GMat().Fabs(load * load * load) : 0;
@@ -171,7 +171,7 @@ Solution OptiSubjectEnProfit::GetVerbose(const EnjoLib::Matrix & dataMat, bool v
                     const SolUtil sut;
                     ELO
                     const double maxHashes2display = maxHashes > 0 ? maxHashes : m_hashes.Max();
-                    LOG << "Hashes cumul. [Hh]: (max = " << sut.round(m_hashes.Max(), 1) << ")\n";
+                    LOG << "Hashes cumul. [H]: (max = " << sut.round(m_hashes.Max(), 1) << ")\n";
                     LOG << AsciiMisc().GenChars("▁", m_hashes.size()) << Nl;
                     LOG << StrColour::GenNorm(StrColour::Col::Magenta, AsciiPlot::Build()(Par::MAXIMUM, maxHashes2display).Finalize().Plot(m_hashes)) << Nl;
                     LOG << "Energy input  [W] : (max = " << sut.round(m_prod.Max(), 1) << ")\n";

diff --git a/src/opti-lib/src/PowerUsageSimulation.cpp b/src/opti-lib/src/PowerUsageSimulation.cpp
@@ -12,7 +12,7 @@ PowerUsageSimulation::PowerUsageSimulation(const OptiEnProfitDataModel & dataMod
 {}
 
 PowerUsageSimulation::SimResult PowerUsageSimulation::Simulate(int i, int currHour, const EnjoLib::Matrix & dataMat,
-                                                             double bonusMul, bool isInitialLoad) const
+                                                             double bonusMul, bool isInitialLoad, double hours) const
 {
     SimResult res{};
     //const EnjoLib::Array<Computer> & comps = m_dataModel.GetComputers();
@@ -29,11 +29,11 @@ PowerUsageSimulation::SimResult PowerUsageSimulation::Simulate(int i, int currHo
         const double hashe = comp.GetHashRate(val) * bonusMul;
         if (ic < comp.minRunHours + 1) // Assuming, that the bonus will last at least for the number of computer's running hours
         {
-            res.sumHashes += hashe * (1 + bonusMulMA);
+            res.sumHashes += hashe * (1 + bonusMulMA) * hours * 3600; // [H] = [H/s] * [adim] * [h] * 3600 [s/h]
         }
         else
         {
-            res.sumHashes += hashe;
+            res.sumHashes += hashe * hours * 3600; // [H] = [H/s] * 3600 [s/h]
         }
         res.sumPowerUsage += comp.GetUsage(val);
     }

diff --git a/src/opti-lib/src/PowerUsageSimulation.h b/src/opti-lib/src/PowerUsageSimulation.h
@@ -26,7 +26,7 @@ class PowerUsageSimulation
     };
 
 	SimResult Simulate(int i, int currHour, const EnjoLib::Matrix & dataMat,
-                        double bonusMul, bool isInitialLoad) const;
+                        double bonusMul, bool isInitialLoad, double hours=1) const;
 
 protected:
 

diff --git a/src/profitability.py b/src/profitability.py
@@ -173,6 +173,8 @@ def historical_diff(self, height:int=None, timestamp:int=None, batch_size:int=10
             print(f"Creating {path}")
             diff, blocked = self._request_headers_batcher(0, height, batch_size=batch_size)
             if blocked:
+                diff.to_pickle(path)
+                print(diff)
                 raise KeyboardInterrupt
             else:
                 diff.to_pickle(path)