Changeset 2c52441 in git

Timestamp:

Aug 3, 2011, 8:29:27 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

b54a36e9b7e412f88420858a291fa64c90adfebe

Parents:

47a4c2d983f929beff4c8f6c6aff4ac93dda2323

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 20:29:27+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:24+01:00

Message:

FIX: last corrections for broken libpolys

Location:

libpolys

Files:

• polys/monomials/ring.cc (modified) (2 diffs)
• polys/monomials/ring.h (modified) (1 diff)
• resources/feResource.cc (modified) (1 diff)
• resources/feResource.h (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -4497 +4497 @@
 }
 
-static ring rAssure_CompLastBlock(ring r, BOOLEAN complete = TRUE)
+ring rAssure_CompLastBlock(ring r, BOOLEAN complete)
 {
   int last_block = rBlocks(r) - 2;
@@ -4552 +4552 @@
 
 // Moves _c or _C ordering to the last place AND adds _s on the 1st place
-ring rAssure_SyzComp_CompLastBlock(const ring r)
-{
+ring rAssure_SyzComp_CompLastBlock(const ring r, BOOLEAN)
+{
+  rTest(r);
+   
   ring new_r_1 = rAssure_CompLastBlock(r, FALSE); // due to this FALSE - no completion!
   ring new_r = rAssure_SyzComp(new_r_1, FALSE); // new_r_1 is used only here!!!
 
-  if (new_r != r)
-  {
-    ring old_r = r;
-    if (new_r_1 != new_r && new_r_1 != old_r) rDelete(new_r_1);
-    rComplete(new_r, 1);
+  if (new_r == r)
+     return r;
+     
+  ring old_r = r;
+  if (new_r_1 != new_r && new_r_1 != old_r) rDelete(new_r_1);
+     
+   rComplete(new_r, 1);
 #ifdef HAVE_PLURAL
-    if (rIsPluralRing(old_r))
-    {
-      if ( nc_rComplete(old_r, new_r, false) ) // no qideal!
-      {
-#ifndef NDEBUG
-        WarnS("error in nc_rComplete"); // cleanup?      rDelete(res);       return r;  // just go on...?
-#endif
-        }
-    }
-    assume(rIsPluralRing(new_r) == rIsPluralRing(old_r));
-#endif
+   if (rIsPluralRing(old_r))
+   {
+       if ( nc_rComplete(old_r, new_r, false) ) // no qideal!
+       {
+# ifndef NDEBUG
+          WarnS("error in nc_rComplete"); // cleanup?      rDelete(res);       return r;  // just go on...?
+# endif
+       }
+   }
+#endif
+     
 ///?    rChangeCurrRing(new_r);
-    if (old_r->qideal != NULL)
-    {
+   if (old_r->qideal != NULL)
+   {
       new_r->qideal = idrCopyR(old_r->qideal, old_r, new_r);
       //currQuotient = new_r->qideal;
+   }
 
 #ifdef HAVE_PLURAL
-      if( rIsPluralRing(old_r) )
-        if( nc_SetupQuotient(new_r, old_r, true) )
-        {
+   if( rIsPluralRing(old_r) )
+     if( nc_SetupQuotient(new_r, old_r, true) )
+       {
 #ifndef NDEBUG
-          WarnS("error in nc_SetupQuotient"); // cleanup?      rDelete(res);       return r;  // just go on...?
-#endif
-        }
-#endif
-    }
+          WarnS("error in nc_SetupQuotient"); // cleanup?      rDelete(res);       return r;  // just go on...?
+#endif
+       }
+#endif
 
 #ifdef HAVE_PLURAL
-    assume((new_r->qideal==NULL) == (old_r->qideal==NULL));
-    assume(rIsPluralRing(new_r) == rIsPluralRing(old_r));
-    assume(rIsSCA(new_r) == rIsSCA(old_r));
-    assume(ncRingType(new_r) == ncRingType(old_r));
-#endif
-
-    rTest(new_r);
-    rTest(old_r);
-  }
-  return new_r;
+   assume((new_r->qideal==NULL) == (old_r->qideal==NULL));
+   assume(rIsPluralRing(new_r) == rIsPluralRing(old_r));
+   assume(rIsSCA(new_r) == rIsSCA(old_r));
+   assume(ncRingType(new_r) == ncRingType(old_r));
+#endif
+   
+   rTest(new_r);
+   rTest(old_r);
+   return new_r;
 }
 

libpolys/polys/monomials/ring.h

@@ -632 +632 @@
 /// makes sure that c/C ordering is last ordering and SyzIndex is first
 ring   rAssure_SyzComp_CompLastBlock(const ring r, BOOLEAN complete = TRUE);
-ring   rAssure_TDeg(const ring r, int start_var, int end_var, int &pos, BOOLEAN complete = TRUE);
+ring   rAssure_TDeg(const ring r, int start_var, int end_var, int &pos);
 
 /// return the max-comonent wchich has syzIndex i

libpolys/resources/feResource.cc

@@ -17 +17 @@
 
 #include "feResource.h"
+
+char* feArgv0 = NULL; 
 
 #ifdef AIX_4

libpolys/resources/feResource.h

@@ -43 +43 @@
 // Prints resources into string with StringAppend, etc
 void feStringAppendResources(int warn = -1);
+#endif /* end ifdef __cplusplus */
 
-#endif
-/* end ifdef __cplusplus */
-
-char* feArgv0=NULL;
+extern char* feArgv0; 
 
 const char fePathSep =