Changeset 028192 in git for libpolys/polys/ideals.h

Timestamp:

Mar 31, 2011, 7:37:45 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

ccd3333fa9eb4f770c3cca33d5e125c9565938ec

Parents:

3f2fb2cdc5019bbfc97d4fa27121402be181a8a3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-31 19:37:45+02:00

git-committer:

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

Message:

FIX: p_polys.cc, ring.cc (mostly NC-stuff + ideals/matrices/numbers)

File:

• libpolys/polys/ideals.h (modified) (8 diffs)

libpolys/polys/ideals.h

@@ -8 +8 @@
 * ABSTRACT - all basic methods to manipulate ideals
 */
-#include <kernel/structs.h>
-#include <kernel/ring.h>
+// #include <kernel/structs.h>
+
+#include <polys/monomials/ring.h>
 
 struct sip_sideal
@@ -18 +19 @@
   int ncols;
   #define IDELEMS(i) ((i)->ncols)
+  #define MATCOLS(i) ((i)->ncols)
+  #define MATROWS(i) ((i)->nrows)
+  #define MATELEM(mat,i,j) ((mat)->m)[MATCOLS((mat)) * ((i)-1) + (j)-1]
+   
 };
 
@@ -28 +33 @@
 };
 
+class ip_smatrix;
+typedef ip_smatrix *       matrix;
+
 struct sideal_list;
 typedef struct sideal_list *      ideal_list;
+
 struct sideal_list
 {
@@ -51 +60 @@
 
 /// delete an ideal
-#define idDelete(h) id_Delete(h, currRing)
+// #define idDelete(h) id_Delete(h, currRing)
 void id_Delete (ideal* h, ring r);
 void id_ShallowDelete (ideal* h, ring r);
@@ -92 +101 @@
 
 ideal id_Copy (ideal h1,const ring r);
-#define idCopy(A) id_Copy(A,currRing)
+#ifdef PDEBUG
+ideal idDBCopy(ideal h1,const char *f,int l,const ring r);
+#define id_DBCopy(A,r) idDBCopy(A,__FILE__,__LINE__,r)
+#define idCopy(A,r) id_DBCopy(A,r)
+#else
+#define idCopy(A,r) id_Copy(A,r)
+#endif
+
+
   /*adds two ideals without simplifying the result*/
 ideal idSimpleAdd (ideal h1,ideal h2);
@@ -109 +126 @@
 
 long idRankFreeModule(ideal m, ring lmRing, ring tailRing);
-inline long idRankFreeModule(ideal m, ring r = currRing)
-{return idRankFreeModule(m, r, r);}
+
+static inline long idRankFreeModule(ideal m, ring r){ return idRankFreeModule(m, r, r); }
+
 // returns TRUE, if idRankFreeModule(m) > 0
-BOOLEAN idIsModule(ideal m, ring r = currRing);
+BOOLEAN idIsModule(ideal m, const ring r);
 BOOLEAN idHomIdeal (ideal id, ideal Q=NULL);
 BOOLEAN idHomModule(ideal m, ideal Q,intvec **w);
@@ -195 +213 @@
 ideal   idTransp(ideal a);
 // version of "ideal idTransp(ideal)" which works within a given ring.
-ideal id_Transp(ideal a, const ring rRing = currRing);
+ideal id_Transp(ideal a, const ring rRing);
 
 intvec *idQHomWeight(ideal id);
@@ -209 +227 @@
 ideal idFarey(ideal x, number N);
 
-ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing = currRing); // image of certain map for BGG
+ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing); // image of certain map for BGG
 
 #ifdef PDEBUG
 /* Shows an ideal -- only for debugging */
-void idShow(const ideal id, const ring lmRing = currRing, const ring tailRing = currRing, const int debugPrint = 0);
+void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint = 0);
 #else
 #define idShow(id, lmRing, tailRing, debugPrint) ((void)0)