Fix an 32 bit truncation on linkRep.

Author: highperformancecoder

classdesc

@@ -171,7 +171,8 @@ struct EvalStack
     auto recipeSize=2*numStars-1;
 
     // suitable up to 10 node networks
-    constexpr unsigned maxNodes=10, maxStars=2*maxNodes-1;
+    constexpr unsigned maxNodes=11, maxStars=2*maxNodes-1;
+    static_assert(sizeof(linkRep)*8 > (maxNodes*(maxNodes-1))/2);
     assert(nodes<=maxNodes);
     auto elemStars=&data.elemStars[0];
     auto pos=&data.pos[0];
@@ -447,9 +448,9 @@ linkRep toLinkRep(const NautyRep& g)
       if (g(i,j))
         {
           if (j<i)
-            l|=1<<(i*(i-1)/2+j);
+            l|=linkRep(1)<<(i*(i-1)/2+j);
           else if (i<j)
-            l|=1<<(j*(j-1)/2+i);
+            l|=linkRep(1)<<(j*(j-1)/2+i);
         }
         // else ignore self-links
   return l;

models/starComplexity.cc

@@ -1,4 +1,4 @@
-using linkRep=unsigned;
+using linkRep=unsigned long long;
 
 #include <map>
 #include <unordered_map>

models/starComplexity.h

@@ -2,7 +2,7 @@
 #print(ecolab.device())
 
 from starComplexity import starC
-nodes=8
+nodes=11
 # computed from max_{l\in[0,L]}min(n+L-l,2l) where L=n(n-1)/2
 maxStars=0
 L=int(0.5*nodes*(nodes-1))
@@ -11,7 +11,8 @@
     maxStars=max(maxStars,v)
 
 print('maxStars=',maxStars)
-maxStars=8
+#maxStars=9
+maxStars=7
 
 #starC.blockSize(256)
 #starC.blockSize(4096)
@@ -22,7 +23,8 @@
 starC.fillStarMap(maxStars)
 starC.canonicaliseStarMap()
 
+print('g','links','*','C','C*','omega(g)','omega(g\')',sep=',')
 for i in starC.starMap.keys():
     c=starC.complexity(i)
-    print(i,starC.symmStar(i),c.complexity(),c.starComplexity(),starC.counts[i],starC.counts[starC.complement(i)])
+    print(i,bin(i).count('1'),starC.symmStar(i),c.complexity(),c.starComplexity(),starC.counts[i],starC.counts[starC.complement(i)],sep=',')