@@ -3,8 +3,8 @@ EXE_S = wilf-server
EXE_I = wilf-interface
EXE_A = wilf-alone
EXE_C = wilf-cilk
-CPP = g++-7 -g
-CPP_CILK = g++-7 -g
+CPP = g++-6 -g
+CPP_CILK = g++-6 -g
CFLAGS = --std=c++11 -march=corei7 -O3 -DNDEBUG
all: $(EXE_S) $(EXE_W) $(EXE_I) $(EXE_A) $(EXE_C)
@@ -10,9 +10,9 @@ using namespace std;
#define MAX_CLIENTS 2048
#define MAX_WORKERS 2048
-#define MAX_GENUS 100
-#define STACK_BOUND 10
-#define CILK_WORKERS "8"
+#define MAX_GENUS 80
+#define STACK_BOUND 20
+#define CILK_WORKERS "2"
#define K_MANUEL 4
@@ -15,7 +15,7 @@ Semigroup::Semigroup(const Semigroup& S){
wilf=S.wilf;
}
-void Semigroup::operator=(const Semigroup& S){
+Semigroup& Semigroup::operator=(const Semigroup& S){
for(auto i=0;i<NBLOCKS;++i){
blocks[i]=S.blocks[i];
@@ -7,10 +7,12 @@
using namespace std;
void work_on(Semigroup& S,Results& res){
- Stack stack;
+ Stack stack;
if(not cut(S)){
+print_Semigroup(S);
treat(S,res);
Semigroup* root=stack.pushed();
+cout<<"root = "<<root<<endl;
*root=S;
walk(stack,res);