Changeset 3d9165 in git

Timestamp:

Aug 10, 2011, 6:44:58 PM (13 years ago)

Author:

Burcin Erocal <burcin@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

88479ff4bbd8d2b194c3da0d9b207cdc5f0af538

Parents:

88a3ea2163706a0102cfc25beed3233b8f552271

git-author:

Burcin Erocal <burcin@erocal.org>2011-08-10 18:44:58+02:00

git-committer:

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

Message:

Convert Singular/Minor* to libpolys.

Location:

Singular

Files:

• Cache.h (modified) (1 diff)
• CacheImplementation.h (modified) (1 diff)
• Minor.cc (modified) (2 diffs)
• Minor.h (modified) (1 diff)
• MinorInterface.cc (modified) (6 diffs)
• MinorInterface.h (modified) (1 diff)
• MinorProcessor.cc (modified) (4 diffs)

Singular/Cache.h

@@ -2 +2 @@
 #define CACHE_H
 
-#include <iostream>
 #include <string>
 #include <list>

Singular/CacheImplementation.h

@@ -1 +1 @@
 #ifndef CACHE_IMPLEMENTATION_H
 #define CACHE_IMPLEMENTATION_H
+
+#include <cstdio> // for sprintf
+#include <iostream>
 
 template<class KeyClass, class ValueClass>

Singular/Minor.cc

@@ +1 @@
+#include <iostream>
+
 #include <kernel/mod2.h>
 #include <kernel/structs.h>
@@ -4 +6 @@
 #include <Minor.h>
 #include <kernel/febase.h>
+
 
 void MinorKey::reset()

Singular/Minor.h

@@ -3 +3 @@
 
 #include <assert.h>
-#include <iostream>
 #include <string>
+
+#include <polys/polys.h>
 
 using namespace std;

Singular/MinorInterface.cc

@@ +1 @@
+// include before anything to avoid clashes with stdio.h included elsewhere
+#include <cstdio>
+
+#include <MinorInterface.h>
+#include <MinorProcessor.h>
+
+#include <polys/polys.h>
+#include <kernel/structs.h>
+
 #include <kernel/mod2.h>
-#include <kernel/structs.h>
-#include <polys/polys.h>
 #include <kernel/ideals.h>
 #include <kernel/kstd1.h>
-#include <polys/matpol.h>
-#include <MinorInterface.h>
-#include <MinorProcessor.h>
 
 bool currRingIsOverIntegralDomain ()
 {
-  if (rField_is_Ring_PtoM()) return false;
-  if (rField_is_Ring_2toM()) return false;
-  if (rField_is_Ring_ModN()) return false;
+  if (rField_is_Ring_PtoM(currRing)) return false;
+  if (rField_is_Ring_2toM(currRing)) return false;
+  if (rField_is_Ring_ModN(currRing)) return false;
   return true;
 }
@@ -18 +22 @@
 bool currRingIsOverField ()
 {
-  if (rField_is_Ring_PtoM()) return false;
-  if (rField_is_Ring_2toM()) return false;
-  if (rField_is_Ring_ModN()) return false;
-  if (rField_is_Ring_Z())    return false;
+  if (rField_is_Ring_PtoM(currRing)) return false;
+  if (rField_is_Ring_2toM(currRing)) return false;
+  if (rField_is_Ring_ModN(currRing)) return false;
+  if (rField_is_Ring_Z(currRing))    return false;
   return true;
 }
@@ -59 +63 @@
       else
       {
-        intArray[i] = n_Int(pGetCoeff(nfPolyArray[i]), currRing);
+        intArray[i] = n_Int(pGetCoeff(nfPolyArray[i]), currRing->cf);
         if (characteristic != 0) intArray[i] = intArray[i] % characteristic;
         if (intArray[i] == 0) zeroCounter++;
@@ -211 +215 @@
   {
     if ((k == 0) && (strcmp(algorithm, "Bareiss") == 0)
-        && (!rField_is_Ring_Z()) && (!allDifferent))
+        && (!rField_is_Ring_Z(currRing)) && (!allDifferent))
     {
       /* In this case, we call an optimized procedure, dating back to
@@ -267 +271 @@
 
   if ((k == 0) && (strcmp(algorithm, "Bareiss") == 0)
-      && (!rField_is_Ring_Z()) && (!allDifferent))
+      && (!rField_is_Ring_Z(currRing)) && (!allDifferent))
   {
     /* In this case, we call an optimized procedure, dating back to
@@ -525 +529 @@
     else if (vars <= 2)                                          b = true;
     else if (currRingIsOverField() && (vars == 3)
-             && (currRing->ch >= 2) && (currRing->ch <= 32003))  b = true;
+             && (currRing->cf->ch >= 2) && (currRing->cf->ch <= 32003))
+            b = true;
   }
   if (!b)

Singular/MinorInterface.h

@@ -1 +1 @@
 #ifndef MINOR_INTERFACE_H
 #define MINOR_INTERFACE_H
+
+
+#include <polys/simpleideals.h>
+#include <polys/polys.h>
 
 /* all computations are module char, if char <> 0;

Singular/MinorProcessor.cc

@@ +1 @@
+#include <MinorProcessor.h>
+
 #include <kernel/mod2.h>
 #include <kernel/structs.h>
 #include <polys/polys.h>
-#include <MinorProcessor.h>
 #include <kernel/febase.h>
 #include <kernel/kstd1.h>
@@ -430 +431 @@
   poly g = kNF(iSB, currRing->qideal, f);
   int result = 0;
-  if (g != NULL) result = n_Int(pGetCoeff(g), currRing);
+  if (g != NULL) result = n_Int(pGetCoeff(g), currRing->cf);
   pDelete(&f);
   pDelete(&g);
@@ -1293 +1294 @@
     addsPoly++;
 #endif
-  kBucket_pt myBucket = kBucketCreate();
+  kBucket_pt myBucket = kBucketCreate(currRing);
   addOperationBucket(p1, p2, myBucket);
   poly p3Neg = pNeg(pCopy(p3));
@@ -1329 +1330 @@
     addsPoly++;
 #endif
-  kBucket_pt myBucket = kBucketCreate();
+  kBucket_pt myBucket = kBucketCreate(currRing);
   addOperationBucket(p1, p2, myBucket);
   poly p3Neg = pNeg(pCopy(p3));