Changeset f32df1 in git

Timestamp:

Jul 7, 2015, 3:01:44 PM (8 years ago)

Author:

Adi Popescu <adi_popescum@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

1c3860b85a769e98757cea4c9c523161e6ffc106

Parents:

80233604ae6eef64f91c19dd7fe4a5b978e249d2

Message:

fix: initenterpairs

File:

• kernel/GBEngine/kutil.cc (modified) (3 diffs)

kernel/GBEngine/kutil.cc

@@ -3228 +3228 @@
         {
           #if ADIDEBUG
-          PrintS("\n initenterpairs: \n");
+          PrintS("\n Trying to add spoly : \n");
           PrintS("                ");p_Write(h, strat->tailRing);
           PrintS("                ");p_Write(strat->S[j],strat->tailRing);
@@ -3250 +3250 @@
       }
     }
+    #if 1
 
     if (new_pair)
     {
-#ifdef HAVE_RATGRING
+    #ifdef HAVE_RATGRING
       if (currRing->real_var_start>0)
         chainCritPart(h,ecart,strat);
       else
-#endif
+    #endif
       strat->chainCrit(h,ecart,strat);
     }
-  }
+    #else
+    kMergeBintoL(strat);
+  }
+  #endif
 }
 
@@ -8406 +8410 @@
     updateS(TRUE,strat);
   }
-  if (strat->fromQ!=NULL) omFreeSize(strat->fromQ,IDELEMS(strat->Shdl)*sizeof(int));
-  strat->fromQ=NULL;
+  //if (strat->fromQ!=NULL) omFreeSize(strat->fromQ,IDELEMS(strat->Shdl)*sizeof(int));
+  //strat->fromQ=NULL;
+  assume(kTest_TS(strat));
 }