Changeset d84a4d in git

Timestamp:

Sep 8, 2011, 9:11:36 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

f7aa4c7c61207b077fe954f2e563ca261edcc109

Parents:

38fc1817a82ba6eed7f9f6355cfa06e1e00e1872

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-08 21:11:36+02:00

git-committer:

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

Message:

FIX: id[^_]* vs id_*: adding inline version to kernel/ideals.h
FIX: exposing id_{InsertPolyWithTests,QHomWeight}

Files:

• Singular/iparith.cc (modified) (3 diffs)
• Singular/ipshell.cc (modified) (2 diffs)
• kernel/ideals.h (modified) (8 diffs)
• libpolys/polys/simpleideals.h (modified) (1 diff)

Singular/iparith.cc

@@ -540 +540 @@
 static BOOLEAN jjPOWER_ID(leftv res, leftv u, leftv v)
 {
-  res->data = (char *)idPower((ideal)(u->Data()),(int)(long)(v->Data()));
+  res->data = (char *)id_Power((ideal)(u->Data()),(int)(long)(v->Data()), currRing);
   if (u!=NULL) return jjOP_REST(res,u,v);
   return FALSE;
@@ -2314 +2314 @@
   pLmDelete(p);
   if (d==1)
-    res->data = (char *)idHomogen((ideal)u->Data(),i);
+    res->data = (char *)id_Homogen((ideal)u->Data(), i, currRing);
   else
     WerrorS("variable must have weight 1");
@@ -5579 +5579 @@
   pLmDelete(p);
   if (d==1)
-    res->data = (char *)idHomogen((ideal)u->Data(),i);
+    res->data = (char *)id_Homogen((ideal)u->Data(), i, currRing);
   else
     WerrorS("variable must have weight 1");

Singular/ipshell.cc

@@ -2795 +2795 @@
 BOOLEAN kQHWeight(leftv res,leftv v)
 {
-  res->data=(char *)idQHomWeight((ideal)v->Data());
+  res->data=(char *)id_QHomWeight((ideal)v->Data(), currRing);
   if (res->data==NULL)
     res->data=(char *)new intvec(rVar(currRing));
@@ -4422 +4422 @@
       {
         test_id->m[0]=gls->m[j];
-        intvec *dummy_w=idQHomWeight(test_id);
+        intvec *dummy_w=id_QHomWeight(test_id, currRing);
         if (dummy_w!=NULL)
         {

kernel/ideals.h

@@ -19 +19 @@
 
 
-ideal idCopyFirstK (const ideal ide, const int k);
+inline ideal idCopyFirstK (const ideal ide, const int k, ring R = currRing)
+{
+  return id_CopyFirstK(ide, k, R);
+}
 
 /// delete an ideal
@@ -34 +37 @@
 //int id_PosConstant(ideal id, const ring r)
 #define idPosConstant(I) id_PosConstant(I,currRing)
-//
+
 /// Count the effective size of an ideal
 /// (without the trailing allocated zero-elements)
-static inline int idSize(const ideal id, const ring r = currRing)
+static inline int idSize(const ideal id)
 {
   int j = IDELEMS(id) - 1;
@@ -93 +96 @@
 
 
-ideal idAdd (ideal h1,ideal h2);
-  /* h1 + h2 */
-BOOLEAN idInsertPoly (ideal h1,poly h2);
-  /* h1 + h2 */
-BOOLEAN idInsertPolyWithTests (ideal h1, const int validEntries,
-  const poly h2, const bool zeroOk, const bool duplicateOk);
-  /* h1 + h2 */
-ideal idMult (ideal h1,ideal h2);
-  /*hh := h1 * h2*/
+/// h1 + h2
+inline ideal idAdd (ideal h1, ideal h2, const ring R = currRing)
+{
+  return id_Add(h1, h2, R);
+}
+
+BOOLEAN idInsertPoly (ideal h1,poly h2);  /* h1 + h2 */
+inline BOOLEAN idInsertPolyWithTests (ideal h1, const int validEntries, const poly h2, const bool zeroOk, const bool duplicateOk, const ring R = currRing)
+{
+  return id_InsertPolyWithTests (h1, validEntries, h2, zeroOk, duplicateOk, R);
+}
+
+
+/* h1 + h2 */
+
+/// hh := h1 * h2
+inline ideal idMult (ideal h1, ideal h2, const ring R = currRing)
+{
+  return id_Mult(h1, h2, R);
+}
 
 BOOLEAN idIs0 (ideal h);
@@ -107 +121 @@
 // returns TRUE, if idRankFreeModule(m) > 0
 BOOLEAN idIsModule(ideal m, const ring r);
-BOOLEAN idHomIdeal (ideal id, ideal Q=NULL);
-BOOLEAN idHomModule(ideal m, ideal Q,intvec **w);
+
+inline BOOLEAN idHomIdeal (ideal id, ideal Q=NULL, const ring R = currRing)
+{
+  return id_HomIdeal(id, Q, R);
+}
+
+inline BOOLEAN idHomModule(ideal m, ideal Q,intvec **w, const ring R = currRing)
+{
+   return id_HomModule(m, Q, w, R);
+}
+
 BOOLEAN idTestHomModule(ideal m, ideal Q, intvec *w);
 
@@ -146 +169 @@
                 BOOLEAN h1IsStb=FALSE, BOOLEAN resultIsIdeal=FALSE);
 
-ideal   idPower(ideal gid,int deg);
+// ideal   idPower(ideal gid,int deg);
 
 //ideal   idElimination (ideal h1,poly delVar);
@@ -158 +181 @@
 ideal   idHead(ideal h);
 
-ideal   idHomogen(ideal h, int varnum);
+// ideal   idHomogen(ideal h, int varnum);
 
 BOOLEAN idIsSubModule(ideal id1,ideal id2);
@@ -167 +190 @@
 }
 
-ideal   idMatrix2Module(matrix mat);
-
-matrix  idModule2Matrix(ideal mod);
-
-matrix  idModule2formatedMatrix(ideal mod,int rows, int cols);
+inline ideal   idMatrix2Module(matrix mat, const ring R = currRing)
+{
+  return idMatrix2Module(mat, R);
+}
+
+inline matrix  idModule2Matrix(ideal mod, const ring R = currRing)
+{
+  return id_Module2Matrix(mod, R);
+}
+inline matrix  idModule2formatedMatrix(ideal mod, int rows, int cols, const ring R = currRing)
+{
+  return id_Module2formatedMatrix(mod, rows, cols, R);
+}
 
 ideal   idSubst(ideal i, int n, poly e);
 
-ideal   idJet(ideal i,int d);
-ideal   idJetW(ideal i,int d, intvec * iv);
+inline ideal   idJet(ideal i, int d, const ring R = currRing)
+{
+  return id_Jet(i, d, R);
+}
+
+inline ideal   idJetW(ideal i,int d, intvec * iv, const ring R = currRing)
+{
+  return id_JetW(i, d, iv, R);
+}
 ideal   idSeries(int n,ideal M,matrix U=NULL,intvec *w=NULL);
 
-BOOLEAN idIsZeroDim(ideal i);
+inline BOOLEAN idIsZeroDim(ideal i, const ring R = currRing)
+{
+  return idIsZeroDim(i, R);
+}
+
 matrix  idDiff(matrix i, int k);
 matrix  idDiffOp(ideal I, ideal J,BOOLEAN multiply=TRUE);
 
-intvec *idSort(ideal id,BOOLEAN nolex=TRUE);
+inline intvec *idSort(ideal id,BOOLEAN nolex=TRUE, const ring R = currRing)
+{
+  return id_Sort(id, nolex, R);
+}
+
 ideal   idModulo (ideal h1,ideal h2, tHomog h=testHomog, intvec ** w=NULL);
 matrix  idCoeffOfKBase(ideal arg, ideal kbase, poly how);
-// transpose a module
-ideal   idTransp(ideal a);
-// version of "ideal idTransp(ideal)" which works within a given ring.
-ideal id_Transp(ideal a, const ring rRing);
-
-intvec *idQHomWeight(ideal id);
+
+/// transpose a module
+inline ideal   idTransp(ideal a, const ring R = currRing)
+{
+  return id_Transp(a, R);
+}
+
+// intvec *idQHomWeight(ideal id);
 
 ideal idXXX (ideal  h1, int k);
@@ -202 +250 @@
 
 ideal id_TensorModuleMult(const int m, const ideal M, const ring rRing); // image of certain map for BGG
+
+
 #endif

libpolys/polys/simpleideals.h

@@ -131 +131 @@
 
 
+/// insert h2 into h1 depending on the two boolean parameters:
+/// - if zeroOk is true, then h2 will also be inserted when it is zero
+/// - if duplicateOk is true, then h2 will also be inserted when it is
+///   already present in h1
+/// return TRUE iff h2 was indeed inserted
+BOOLEAN id_InsertPolyWithTests (ideal h1, const int validEntries,
+                                const poly h2, const bool zeroOk,
+                                const bool duplicateOk, const ring r);
+
+
+intvec * id_QHomWeight(ideal id, const ring r);
+
+
 #endif