Changeset 301c033 in git

Timestamp:

Jul 21, 2010, 4:10:14 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

198c60532f02886e728a0b264975f50487915682

Parents:

19191129ddddff4c6aac6c8ee9304d5336e4acbf

Message:

rDefault

git-svn-id: file:///usr/local/Singular/svn/trunk@13042 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

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

kernel/ring.cc

@@ -129 +129 @@
 }
 
-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)
 {
   ring r=(ring) omAlloc0Bin(sip_sring_bin);
@@ -143 +143 @@
   }
   /*weights: entries for 2 blocks: NULL*/
-  r->wvhdl = (int **)omAlloc0(2 * sizeof(int_ptr));
-  /*order: lp,0*/
-  r->order = (int *) omAlloc(2* sizeof(int *));
-  r->block0 = (int *)omAlloc0(2 * sizeof(int *));
-  r->block1 = (int *)omAlloc0(2 * sizeof(int *));
-  /* ringorder dp for the first block: var 1..N */
-  r->order[0]  = ringorder_lp;
-  r->block0[0] = 1;
-  r->block1[0] = N;
-  /* the last block: everything is 0 */
-  r->order[1]  = 0;
+  r->wvhdl = (int **)omAlloc0((ord_size+1) * sizeof(int_ptr));
+  r->order = ord;
+  r->block0 = block0;
+  r->block1 = block1;
   /*polynomial ring*/
   r->OrdSgn    = 1;
@@ -160 +153 @@
   rComplete(r);
   return r;
+}
+
+ring rDefault(int ch, int N, char **n)
+{
+  /*order: lp,0*/
+  int *order = (int *) omAlloc(2* sizeof(int));
+  int *block0 = (int *)omAlloc0(2 * sizeof(int));
+  int *block1 = (int *)omAlloc0(2 * sizeof(int));
+  /* ringorder dp for the first block: var 1..N */
+  order[0]  = ringorder_lp;
+  block0[0] = 1;
+  block1[0] = N;
+  /* the last block: everything is 0 */
+  order[1]  = 0;
+
+  return rDefault(ch,N,n,2,order,block0,block1);
 }
 

kernel/ring.h

@@ -64 +64 @@
 idhdl  rDefault(const char *s);
 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);
+
 #define rIsRingVar(A) r_IsRingVar(A,currRing)
 int    r_IsRingVar(const char *n, ring r);