Merge pull request #1651 from cyrossignol/magnitude

Add precision to support magnitudes less than 1

Author: jamescowens

src/Makefile.am

@@ -100,6 +100,7 @@ GRIDCOIN_CORE_H = \
 	neuralnet/accrual/research_age.h \
 	neuralnet/claim.h \
 	neuralnet/cpid.h \
+	neuralnet/magnitude.h \
 	neuralnet/project.h \
 	neuralnet/quorum.h \
 	neuralnet/researcher.h \

src/Makefile.test.include

@@ -43,6 +43,7 @@ GRIDCOIN_TESTS =\
   test/netbase_tests.cpp \
   test/neuralnet/claim_tests.cpp \
   test/neuralnet/cpid_tests.cpp \
+  test/neuralnet/magnitude_tests.cpp \
   test/neuralnet/project_tests.cpp \
   test/neuralnet/researcher_tests.cpp \
   test/neuralnet/superblock_tests.cpp \

src/appcache.cpp

@@ -1,5 +1,4 @@
 #include "appcache.h"
-#include "main.h"
 #include "util.h"
 
 #include <boost/algorithm/string.hpp>

src/beacon.cpp

@@ -78,7 +78,7 @@ int64_t MaxBeaconAge()
 int64_t BeaconAgeAdvertiseThreshold()
 {
     // 5 months in seconds.
-    return 3600 * 24 * 30 * 5;    
+    return 3600 * 24 * 30 * 5;
 }
 
 void GetBeaconElements(const std::string& sBeacon, std::string& out_cpid, std::string& out_address, std::string& out_publickey)
@@ -101,7 +101,7 @@ std::string GetBeaconPublicKey(const std::string& cpid, bool bAdvertisingBeacon)
     std::string sBeacon = RetrieveBeaconValueWithMaxAge(cpid, iMaxSeconds);
     if (sBeacon.empty())
         return "";
-    
+
     // Beacon data structure: CPID,hashRand,Address,beacon public key: base64 encoded
     std::string sContract = DecodeBase64(sBeacon);
     std::vector<std::string> vContract = split(sContract.c_str(),";");
@@ -244,14 +244,14 @@ bool VerifyBeaconContractTx(const CTransaction& tx)
 }
 
 bool ImportBeaconKeysFromConfig(const std::string& cpid, CWallet* wallet)
-{    
+{
     if(cpid.empty())
         return error("Empty CPID");
 
     std::string strSecret = GetArgument("privatekey" + cpid + (fTestNet ? "testnet" : ""), "");
     if(strSecret.empty())
         return false;
-    
+
     auto vecsecret = ParseHex(strSecret);
 
     CKey key;
@@ -335,7 +335,7 @@ BeaconStatus GetBeaconStatus(std::string& sCPID)
     beacon_status.iBeaconTimestamp = BeaconTimeStamp(sCPID);
     beacon_status.timestamp = TimestampToHRDate(beacon_status.iBeaconTimestamp);
     beacon_status.hasBeacon = HasActiveBeacon(sCPID);
-    beacon_status.dPriorSBMagnitude = NN::Tally::GetMagnitude(NN::MiningId::Parse(sCPID));
+    beacon_status.dPriorSBMagnitude = NN::Tally::GetMagnitude(NN::MiningId::Parse(sCPID)).Floating();
     beacon_status.is_mine = (sCPID == NN::GetPrimaryCpid());
 
     return beacon_status;

src/checkpoints.cpp

@@ -6,9 +6,6 @@
 #include <boost/range/adaptor/reversed.hpp>
 
 #include "checkpoints.h"
-
-#include "txdb.h"
-#include "main.h"
 #include "uint256.h"
 
 

src/contract/polls.cpp

@@ -99,7 +99,7 @@ std::pair<std::string, std::string> CreateVoteContract(std::string sTitle, std::
     const std::string primary_cpid = NN::GetPrimaryCpid();
 
     std::string GRCAddress = DefaultWalletAddress();
-    double dmag = NN::Tally::MyMagnitude();
+    double dmag = NN::Tally::MyMagnitude().Floating();
     double poll_duration = PollDuration(sTitle) * 86400;
 
     // Prevent Double Voting

src/db.h

@@ -6,8 +6,9 @@
 #define BITCOIN_DB_H
 
 #include "fs.h"
-#include "main.h"
 #include "streams.h"
+#include "sync.h"
+#include "version.h"
 
 #include <map>
 #include <string>

src/main.cpp

@@ -570,7 +570,7 @@ void GetGlobalStatus()
 
     try
     {
-        double boincmagnitude = NN::Tally::MyMagnitude();
+        double boincmagnitude = NN::Tally::MyMagnitude().Floating();
         uint64_t nWeight = 0;
         pwalletMain->GetStakeWeight(nWeight);
         nBoincUtilization = boincmagnitude; //Legacy Support for the about screen
@@ -2623,7 +2623,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex, bool fJustCheck)
             {
                 // 6-4-2017 - Verify researchers stored block magnitude
                 // 2018 02 04 - Moved here for better effect.
-                double dNeuralNetworkMagnitude = NN::Tally::GetMagnitude(claim.m_mining_id);
+                double dNeuralNetworkMagnitude = NN::Tally::GetMagnitude(claim.m_mining_id).Floating();
                 if (claim.m_magnitude > (dNeuralNetworkMagnitude * 1.25)
                     && (fTestNet || (!fTestNet && (pindex->nHeight-1) > 947000)))
                 {

src/miner.cpp

@@ -1060,7 +1060,7 @@ bool CreateGridcoinReward(CBlock &blocknew, CBlockIndex* pindexPrev, int64_t &nR
     }
 
     if (const NN::CpidOption cpid = claim.m_mining_id.TryCpid()) {
-        claim.m_magnitude = NN::Tally::GetMagnitude(*cpid);
+        claim.m_magnitude = NN::Tally::GetMagnitude(*cpid).Floating();
     }
 
     LogPrintf(