Changeset 1ed346 in git for kernel/syz1.cc

Timestamp:

Mar 15, 2011, 7:17:46 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

e9c3b29fc2ccfc0e5b778e8460f2dca4275e666e

Parents:

273fed0aea0c3cb00dc08f02c5d5340a2a781f23

Message:

FIX: correct assumes for ringorder_S/ro_syzcomp due to rCurrRingAssure_dp_S for syLaScala3
TODO: LaScala is broken for K[x] (single variable, since dp will be left out)

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@13977 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/syz1.cc (modified) (3 diffs)

kernel/syz1.cc

@@ -1640 +1640 @@
     if ((syzstr->syRing != NULL) && (syzstr->syRing != r))
     {
+      rNChangeSComps(NULL, NULL, syzstr->syRing);
       rKill(syzstr->syRing);
     }
@@ -2594 +2595 @@
   syzstr->syRing = rCurrRingAssure_dp_S();
   assume(syzstr->syRing != origR);
+  assume(syzstr->syRing->typ[1].ord_typ == ro_syzcomp);  
+
 
   // set initial ShiftedComps
@@ -2622 +2625 @@
   omFreeSize((ADDRESS)currcomponents,(arg->rank+1)*sizeof(int));
   omFreeSize((ADDRESS)currShiftedComponents,(arg->rank+1)*sizeof(long));
+  
   syzstr->res = (resolvente)omAlloc0((maxlength+1)*sizeof(ideal));
   syzstr->orderedRes = (resolvente)omAlloc0((maxlength+1)*sizeof(ideal));
   syzstr->elemLength = (int**)omAlloc0((maxlength+1)*sizeof(int*));
+
   syzstr->truecomponents = (int**)omAlloc0((maxlength+1)*sizeof(int*));
   syzstr->ShiftedComponents = (long**)omAlloc0((maxlength+1)*sizeof(long*));
+
   syzstr->backcomponents = (int**)omAlloc0((maxlength+1)*sizeof(int*));
   syzstr->Howmuch = (int**)omAlloc0((maxlength+1)*sizeof(int*));
   syzstr->Firstelem = (int**)omAlloc0((maxlength+1)*sizeof(int*));
   syzstr->sev = (unsigned long **) omAlloc0((maxlength+1)*sizeof(unsigned long *));
+
+  assume( syzstr->length == maxlength );
+  
   syzstr->bucket = kBucketCreate();
   int len0=idRankFreeModule(temp)+1;