Changeset 1ddd04 in git

Timestamp:

Apr 20, 2011, 7:14:08 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

17e473accf9564b8b0b38cf730a72e24272bad8a

Parents:

0ebd7e2b6d36c0b21765218475b3441258a77b4d

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-04-20 19:14:08+02:00

git-committer:

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

Message:

rDefault via coeffs

Location:

libpolys/polys/monomials

Files:

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

libpolys/polys/monomials/ring.cc

@@ -136 +136 @@
 */
 
-ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
+ring rDefault(coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
 {
   ring r=(ring) omAlloc0Bin(sip_sring_bin);
-  r->ch    = ch;
+  r->ch    = n_GetChar(cf);
   r->N     = N;
+  r->cf = cf;
   /*r->P     = 0; Alloc0 */
   /*names*/
@@ -161 +162 @@
   return r;
 }
-
-ring rDefault(int ch, int N, char **n)
-{
+ring rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1)
+{
+  coeffs cf;
+  if (ch==0) cf=nInitChar(n_Q,NULL);
+  else       cf=nInitChar(n_Zp,(void*)(long)ch);
+  return rDefault(cf,N,n,ord_size,ord,block0,block1);
+}
+ring   rDefault(coeffs cf, int N, char **n)
+{  
   /*order: lp,0*/
   int *order = (int *) omAlloc(2* sizeof(int));
@@ -175 +182 @@
   order[1]  = 0;
 
-  return rDefault(ch,N,n,2,order,block0,block1);
+  return rDefault(cf,N,n,2,order,block0,block1);
+}
+
+ring rDefault(int ch, int N, char **n)
+{
+  coeffs cf;
+  if (ch==0) cf=nInitChar(n_Q,NULL);
+  else       cf=nInitChar(n_Zp,(void*)(long)ch);
+  return rDefault(cf,N,n);
 }
 

libpolys/polys/monomials/ring.h

@@ -330 +330 @@
 idhdl  rDefault(const char *s);
 ring   rDefault(int ch, int N, char **n);
+ring   rDefault(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(coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1);
 
 // #define rIsRingVar(A) r_IsRingVar(A,currRing)