Changeset 7ee1907 in git for libpolys/polys/monomials

Timestamp:

Feb 28, 2012, 3:13:36 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d901095118d1ee38940016e9b6c108a54485ac2a

Parents:

e8086733d77deaf0656dc33bc685bcc08f6a96ab

Message:

chg: update to ssi-3

Location:

libpolys/polys/monomials

Files:

• ring.cc (modified) (5 diffs)
• ring.h (modified) (2 diffs)

libpolys/polys/monomials/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
-
 /*
 * ABSTRACT - the interpreter related ring operations
@@ -108 +106 @@
 //}
 
-ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
+ring rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int** wvhdl)
 {
   assume( cf != NULL);
@@ -123 +121 @@
   }
   /*weights: entries for 2 blocks: NULL*/
-  r->wvhdl = (int **)omAlloc0((ord_size+1) * sizeof(int *));
+  if (wvhdl==NULL)
+    r->wvhdl = (int **)omAlloc0((ord_size+1) * sizeof(int *));
+  else
+    r->wvhdl=wvhdl;
   r->order = ord;
   r->block0 = block0;
@@ -134 +135 @@
   return r;
 }
-ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
+ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1,int ** wvhdl)
 {
   coeffs cf;
@@ -140 +141 @@
   else       cf=nInitChar(n_Zp,(void*)(long)ch);
   assume( cf != NULL);
-  return rDefault(cf,N,n,ord_size,ord,block0,block1);
+  return rDefault(cf,N,n,ord_size,ord,block0,block1,wvhdl);
 }
 ring   rDefault(const coeffs cf, int N, char **n)

libpolys/polys/monomials/ring.h

@@ -317 +317 @@
 ring   rDefault(int ch, int N, char **n);
 ring   rDefault(const coeffs cf, int N, char **n);
-ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
-ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
+ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
+ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
 
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)
@@ -603 +603 @@
   // the following are only used internally
   ringorder_aa, ///< for idElimination, like a, except pFDeg, pWeigths ignore it
-  ringorder_rs, ///< ???
+  ringorder_rs, ///< opposite of ls
   ringorder_IS, ///< Induced (Schreyer) ordering
   ringorder_unspec