Changeset 930719 in git
- Timestamp:
- Nov 17, 2020, 1:58:52 PM (3 years ago)
- Branches:
- (u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')
- Children:
- 9423058a6c6c15f2436061ded858654af6c902ac
- Parents:
- e324f51573c3a0db123f5473c70ad06029c9768a
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/extra.cc
re324f51 r930719 67 67 #include "kernel/GBEngine/syz.h" 68 68 #include "kernel/GBEngine/kutil.h" 69 #include "kernel/GBEngine/kverify.h" 69 70 70 71 #include "kernel/linear_algebra/linearAlgebra.h" … … 3878 3879 } 3879 3880 ideal F=(ideal)h->Data(); 3880 res->data=(char*)(long) kVerify (F,currRing->qideal);3881 res->data=(char*)(long) kVerify2(F,currRing->qideal); 3881 3882 res->rtyp=INT_CMD; 3882 3883 return FALSE; -
kernel/GBEngine/kverify.cc
re324f51 r930719 7 7 #include "polys/monomials/ring.h" 8 8 #include "kernel/GBEngine/kutil.h" 9 #include "kernel/GBEngine/kverify.h" 9 10 #include "Singular/feOpt.h" 10 11 #include <stdlib.h> 11 12 #include <string.h> 12 13 13 #define MULTIPROCESS 1 14 #ifdef MULTIPROCESS 14 #if !defined(__CYGWIN__) 15 15 #include "kernel/oswrapper/vspace.h" 16 16 #include <sys/types.h> … … 18 18 #endif 19 19 20 BOOLEAN kVerify (ideal F, ideal Q)20 BOOLEAN kVerify1(ideal F, ideal Q) 21 21 { 22 22 kStrategy strat=new skStrategy; … … 73 73 /*---------------------------------------------------------------------*/ 74 74 BOOLEAN all_okay=TRUE; 75 #ifndef MULTIPROCESS /* seriell */76 75 for(int i=strat->Ll;i>=0; i--) 77 76 { … … 117 116 } 118 117 return all_okay; 119 #endif 118 } 119 120 BOOLEAN kVerify2(ideal F, ideal Q) 121 { 122 #if !defined(__CYGWIN__) 123 kStrategy strat=new skStrategy; 124 strat->ak = id_RankFreeModule(F,currRing); 125 strat->kModW=kModW=NULL; 126 strat->kHomW=kHomW=NULL; 127 initBuchMoraCrit(strat); /*set Gebauer, honey, sugarCrit*/ 128 initBuchMoraPos(strat); 129 initBba(strat); 130 initBuchMora(F, Q,strat); 131 /*initBuchMora:*/ 132 strat->tail = pInit(); 133 /*- set s -*/ 134 strat->sl = -1; 135 /*- set L -*/ 136 strat->Lmax = ((IDELEMS(F)+setmaxLinc-1)/setmaxLinc)*setmaxLinc; 137 strat->Ll = -1; 138 strat->L = initL(strat->Lmax); 139 /*- set B -*/ 140 strat->Bmax = setmaxL; 141 strat->Bl = -1; 142 strat->B = initL(); 143 /*- set T -*/ 144 strat->tl = -1; 145 strat->tmax = setmaxT; 146 strat->T = initT(); 147 strat->R = initR(); 148 strat->sevT = initsevT(); 149 /*- init local data struct.---------------------------------------- -*/ 150 strat->P.ecart=0; 151 strat->P.length=0; 152 strat->P.pLength=0; 153 initS(F, Q,strat); /*sets also S, ecartS, fromQ */ 154 strat->fromT = FALSE; 155 strat->noTailReduction = FALSE; 156 /*----------------------------------------------------------------------*/ 157 /* build pairs */ 158 if (strat->fromQ!=NULL) 159 { 160 for(int i=1; i<=strat->sl;i++) 161 { 162 initenterpairs(strat->S[i],i-1,0,strat->fromQ[i],strat); 163 } 164 } 165 else 166 { 167 for(int i=1; i<=strat->sl;i++) 168 { 169 initenterpairs(strat->S[i],i-1,0,FALSE,strat); 170 } 171 } 172 if (TEST_OPT_PROT) printf("%d pairs created\n",strat->Ll+1); 173 if (TEST_OPT_DEBUG) messageSets(strat); 120 174 /*---------------------------------------------------------------------*/ 121 #ifdef MULTIPROCESS175 BOOLEAN all_okay=TRUE; 122 176 int cpus=(int)(long)feOptValue(FE_OPT_CPUS); 123 177 int parent_pid=getpid(); … … 232 286 return all_okay; 233 287 } 234 #endif 288 #else 289 return kVerify1(F,Q); 290 #endif 235 291 } -
kernel/GBEngine/kverify.h
re324f51 r930719 1 BOOLEAN kVerify(ideal F, ideal Q); 1 #ifndef KVERIFY_H 2 #define KVERIFY_H 3 #include "polys/simpleideals.h" 4 BOOLEAN kVerify1(ideal F, ideal Q); /* seriell*/ 5 BOOLEAN kVerify2(ideal F, ideal Q); /* parallel */ 6 #endif -
kernel/oswrapper/vspace.cc
re324f51 r930719 1 1 // https://github.com/rbehrends/vspace 2 2 #include "vspace.h" 3 4 #if !defined(__CYGWIN__) 3 5 4 6 #ifdef HAVE_CPP_THREADS … … 552 554 553 555 } // namespace vspace 556 #endif -
kernel/oswrapper/vspace.h
re324f51 r930719 1 #ifndef VSPACE_H 2 #define VSPACE_H 1 3 #include <fcntl.h> 2 4 #include <stddef.h> … … 9 11 #include <assert.h> 10 12 #include <new> // for placement new 13 14 #if !defined(__CYGWIN__) 11 15 12 16 #if __cplusplus >= 201100 … … 1334 1338 1335 1339 }; // namespace vspace 1340 #endif 1341 #endif
Note: See TracChangeset
for help on using the changeset viewer.