Disable MSM

Author: nixw

c/curve.hpp

@@ -1,8 +1,7 @@
 #include <string>
 
 #include "exp.hpp"
-//#include "multiexp.hpp"
-//#include "run.hpp"
+#include "multiexp.hpp"
 #include "msm/msm.hpp"
 #include <iostream>
 #include <chrono>
@@ -121,6 +120,11 @@ class Curve {
     }
 
     void multiMulByScalar(Point &r, PointAffine *bases, uint8_t* scalars, unsigned int scalarSize, unsigned int n, unsigned int nThreads=0) {
+        ParallelMultiexp<Curve<BaseField>> pm(*this);
+        pm.multiexp(r, bases, scalars, scalarSize, n, nThreads);
+    }
+
+    void multiMulByScalarMSM(Point &r, PointAffine *bases, uint8_t* scalars, unsigned int scalarSize, unsigned int n, unsigned int nThreads=0) {
 
         // Original multiexp
         // ***************
@@ -155,8 +159,8 @@ class Curve {
         // New multiexp
         // ***************
 
-        MSM<Curve<BaseField>, BaseField> msm(*this);
-        msm.run(r, bases, scalars, scalarSize, n, nThreads);
+        MSM<Curve<BaseField>, BaseField> msm(*this,  bases, scalars, scalarSize, n);
+        msm.run(r, nThreads);
 
         // ***************
 
@@ -167,6 +171,7 @@ class Curve {
 
     }
 
+
 #ifdef COUNT_OPS
     void resetCounters();
     void printCounters();
@@ -177,4 +182,3 @@ class Curve {
 
 
 #include "curve.cpp"
-

c/multiexp.cpp

@@ -129,20 +129,12 @@ void ParallelMultiexp<Curve>::multiexp(typename Curve::Point &r, typename Curve:
         return;
     }
 
-    std::cout << "scalarSize: " << scalarSize << std::endl;
-    for (uint32_t i=0; i<scalarSize; i++) {
-        std::cout << "scalar " << i << ": " << (uint64_t)_scalars[i] << std::endl;
-    }
-
     bitsPerChunk = log2(n / PME2_PACK_FACTOR);
     if (bitsPerChunk > PME2_MAX_CHUNK_SIZE_BITS) bitsPerChunk = PME2_MAX_CHUNK_SIZE_BITS;
     if (bitsPerChunk < PME2_MIN_CHUNK_SIZE_BITS) bitsPerChunk = PME2_MIN_CHUNK_SIZE_BITS;
     nChunks = ((scalarSize*8 - 1 ) / bitsPerChunk)+1;
     accsPerChunk = 1 << bitsPerChunk;  // In the chunks last bit is always zero.
 
-    // prints all information about the process:
-    std::cout << "*** MSM Initiate *** (threads: " << nThreads << ", window-bits: " << bitsPerChunk << ", windows: " << nChunks << "points: " << n << ") \n";
-
     typename Curve::Point *chunkResults = new typename Curve::Point[nChunks];
     accs = new PaddedPoint[nThreads*accsPerChunk];
     // std::cout << "InitTrees " << "\n";

c/multiexp.hpp

@@ -6,7 +6,7 @@
 #define PME2_MIN_CHUNK_SIZE_BITS 2
 
 template <typename Curve>
-class ParallelMultiexp { // MSM
+class ParallelMultiexp {
 
     struct PaddedPoint {
         typename Curve::Point p;