Changeset 1ed346 in git

Timestamp:

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

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

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

Files:

• Singular/LIB/standard.lib (modified) (1 diff)
• kernel/ring.cc (modified) (7 diffs)
• kernel/ring.h (modified) (1 diff)
• kernel/syz1.cc (modified) (3 diffs)

Singular/LIB/standard.lib

@@ -1385 +1385 @@
    {
       resolution re;
-      if (((i==0) or (i>=nvars(basering))) && typeof(m) != "module")
+      if (((i==0) or (i>=nvars(basering))) && (typeof(m) != "module") && (nvars(basering)>1))
       {
         //LaScala for the homogeneous case and i == 0

kernel/ring.cc

@@ -3676 +3676 @@
 
       case ringorder_S:
-        assume(typ_i == 0 && j == 0);
+        assume(typ_i == 1); // For LaScala3 only: on the 2nd place ([1])!
+        // TODO: for K[x]: it is 0...?!
         rO_Syzcomp(j, j_bits,prev_ordsgn, tmp_ordsgn,tmp_typ[typ_i]);
         need_to_add_comp=TRUE;
@@ -3684 +3685 @@
       case ringorder_s:
         assume(typ_i == 0 && j == 0);
-        rO_Syz(j, j_bits, prev_ordsgn, tmp_ordsgn, tmp_typ[typ_i]);
+        rO_Syz(j, j_bits, prev_ordsgn, tmp_ordsgn, tmp_typ[typ_i]); // set syz-limit?
         need_to_add_comp=TRUE;
         typ_i++;
@@ -3867 +3868 @@
         else if (r->typ[i].ord_typ == ro_syzcomp)
         {
+          assume( r->typ[i].data.syzcomp.ShiftedComponents == NULL );
+          assume( r->typ[i].data.syzcomp.Components        == NULL );
+//          WarnS( "rUnComplete : ord_typ == ro_syzcomp was unhandled!!! Possibly memory leak!!!"  );
 #ifndef NDEBUG
-          Warn( "rUnComplete : ord_typ == ro_syzcomp was unhandled!!! Possibly memory leak!!!"  );
+//          assume(0);
 #endif
         }
@@ -4298 +4302 @@
                      ring r)
 {
+  assume(r->typ[1].ord_typ == ro_syzcomp);
+      
   r->typ[1].data.syzcomp.length = length;
   rNChangeSComps( currComponents, currShiftedComponents, r);
@@ -4306 +4312 @@
                  ring r)
 {
+  assume(r->typ[1].ord_typ == ro_syzcomp);
+  
   *length = r->typ[1].data.syzcomp.length;
   rNGetSComps( currComponents, currShiftedComponents, r);
@@ -4313 +4321 @@
 void rNChangeSComps(int* currComponents, long* currShiftedComponents, ring r)
 {
-  assume(r->order[1]==ringorder_S);
+  assume(r->typ[1].ord_typ == ro_syzcomp);
 
   r->typ[1].data.syzcomp.ShiftedComponents = currShiftedComponents;
@@ -4321 +4329 @@
 void rNGetSComps(int** currComponents, long** currShiftedComponents, ring r)
 {
-  assume(r->order[1]==ringorder_S);
+  assume(r->typ[1].ord_typ == ro_syzcomp);
 
   *currShiftedComponents = r->typ[1].data.syzcomp.ShiftedComponents;

kernel/ring.h

@@ -101 +101 @@
 
 
+// The following are for LaScala3 only!
 #ifdef PDEBUG
 #define rChangeSComps(c,s,l) rDBChangeSComps(c,s,l)

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;