Changeset 4dbeb1 in git

Timestamp:

Aug 10, 2011, 3:23:20 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

cf41549933e3a2f719c447992e836d965e3be351

Parents:

3705cd9bb524607a0a68e71450ae458b8cb98e69

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-10 15:23:20+02:00

git-committer:

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

Message:

FIX: idNormalize -> id_Normalize(..., +ring), currRingHdl is defined in ipid.h

Location:

Singular

Files:

• gms.cc (modified) (3 diffs)
• gms.h (modified) (1 diff)

Singular/gms.cc

@@ -11 +11 @@
 #ifdef HAVE_GMS
 
-#include <kernel/febase.h>
-#include <kernel/structs.h>
+#include "gms.h"
+
 #include <coeffs/numbers.h>
 #include <polys/polys.h>
-#include <kernel/ideals.h>
-#include <Singular/lists.h>
-#include <polys/matpol.h>
-#include <Singular/gms.h>
+#include <kernel/febase.h>
 
+#include "ipid.h"
 
 lists gmsNF(ideal p,ideal g,matrix B,int D,int K)
@@ -28 +26 @@
   matrix B0=mpNew(MATROWS(B),MATCOLS(B));
   for(int i=1;i<=MATROWS(B0);i++)
-    for(int j=1;j<=MATCOLS(B0);j++)
+     for(int j=1;j<=MATCOLS(B0);j++)
       if(MATELEM(B,i,j)!=NULL)
         MATELEM(B0,i,j)=pDiff(MATELEM(B,i,j),i+1);
@@ -86 +84 @@
   idDelete((ideal *)&B0);
 
-  idNormalize(r);
-  idNormalize(q);
+  id_Normalize(r, currRing);
+  id_Normalize(q, currRing);
 
   lists l=(lists)omAllocBin(slists_bin);

Singular/gms.h

@@ -10 +10 @@
 #define GMS_H
 
-lists gmsNF(ideal p,ideal g,matrix B,int D,int K);
-BOOLEAN gmsNF(leftv res,leftv h);
+#include <misc/auxiliary.h>
+#include <polys/matpol.h>
+
+#include <kernel/structs.h>
+#include <kernel/ideals.h>
+
+#include <Singular/lists.h>
+lists gmsNF(ideal p, ideal g, matrix B, int D, int K);
+BOOLEAN gmsNF(leftv res, leftv h);
 
 #endif /* GMS_H */