Throw if specified nodees exceeds maximum configured

starUpperBound should never return 0.
Fixes for SYCL

Author: highperformancecoder

classdesc

@@ -39,6 +39,8 @@ linkRep edge(unsigned i, unsigned j)
 
 void StarComplexityGen::generateElementaryStars(unsigned nodes)
 {
+  if (nodes>maxNodes)
+    throw runtime_error("nodes requested exceeds maximum configured: "+to_string(maxNodes));
   for (unsigned i=0; i<nodes; ++i)
     {
       linkRep star=0;
@@ -617,7 +619,6 @@ unsigned StarComplexityGen::starUpperBound(const linkRep& x) const
 {
   unsigned ub=::starUpperBound(x, elemStars.size());
   unsigned complementUb=::starUpperBound(~x, elemStars.size());
-  if (ub==0) return complementUb;
-  if (complementUb==0) return ub;
-  return min(::starUpperBound(x, elemStars.size()), ::starUpperBound(~x,elemStars.size()));
+  assert(ub>0 && complementUb>0);
+  return min(ub, complementUb);
 }

models/starComplexity.cc

@@ -1,5 +1,5 @@
 // hard code maximum number of nodes
-constexpr unsigned maxNodes=8, maxStars=2*maxNodes-1;
+constexpr unsigned maxNodes=10, maxStars=2*maxNodes-1;
 
 //using linkRep=unsigned long long;
 
@@ -51,7 +51,7 @@ class linkRepImpl
   bool operator()(unsigned i,unsigned j) const {
         if (i<j) std::swap(i,j);
         auto d=div(i*(i-1)/2+j, int(8*sizeof(Impl)));
-        return (data[d.quot] & (Impl(1)<<d.rem))!=0;
+        return Impl(data[d.quot] & (Impl(1)<<d.rem));
   }
   bool empty() const {
     for (unsigned i=0; i<size; ++i)

models/starComplexity.h

@@ -3,7 +3,7 @@
 
 from starComplexity import starC
 from datetime import datetime
-nodes=7
+nodes=10
 # 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))
@@ -12,7 +12,7 @@
     maxStars=max(maxStars,v)
 
 print('maxStars=',maxStars)
-maxStars=6
+maxStars=9
 
 #starC.blockSize(256)
 starC.blockSize(4096)
@@ -26,14 +26,17 @@
     print('completed',numStars,datetime.now())
     starC.canonicaliseStarMap()
     with open(f'{nodes}-{maxStars}.csv','w') as out:
-        print('id,links','*','C','C*','omega(g)','omega(g\')',sep=',',file=out)
+        print('id,g,links','*','bar{*}','C','C*','omega(g)',sep=',',file=out)
         id=0
         for i in starC.starMap.keys():
             c=starC.complexity(i)
             links=0
+            num=0
+            m=1
             for j in i:
                 links+=bin(j).count('1')
-
-            #print(id,links,starC.symmStar(i)-1,c.complexity(),c.starComplexity(),starC.counts[i],sep=',',file=out)
-            print(id,bin(i[0]),starC.starMap[i],starC.starUpperBound(i));
+                num+=m*j
+                m*=1<<32
+                
+            print(id,bin(num),links,starC.symmStar(i)-1,starC.starUpperBound(i)-1,c.complexity(),c.starComplexity(),starC.counts[i],sep=',',file=out)
             id+=1

models/starComplexity.py

@@ -74,6 +74,7 @@ class VecBitSet: public sycl::vec<T,N>
   VecBitSet()=default;
   template <class U>
   explicit VecBitSet(const U& x): sycl::vec<T,N>(x) {}
+  explicit VecBitSet(Vec&& x): sycl::vec<T,N>(std::move(x)) {}
   VecBitSet& operator=(T x) {sycl::vec<T,N>::operator=(x); return *this;}
   VecBitSet& operator=(const Vec& x) {sycl::vec<T,N>::operator=(x); return *this;}
   operator bool() const {
@@ -129,6 +130,12 @@ class VecBitSet: public sycl::vec<T,N>
     }
   }
 
+  bool operator==(const VecBitSet& x) const {
+    for (unsigned i=0; i<N; ++i)
+      if ((*this)[i]!=x[i])
+        return false;
+    return true;
+  }
   auto operator<=>(const VecBitSet& x) const {
     for (unsigned i=0; i<N; ++i)
       if (auto r=(*this)[i]<=>x[i]; r!=0)