Changeset 55b1687 in git for Singular/iparith.cc

Timestamp:

Mar 11, 2011, 4:34:19 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

f2b6f0bd6a46f6e00696b0aab36f3e899b37e560

Parents:

2371525d3d49c697091cb5d9c5bc6130420e6707

Message:

chinrem for bigint without ring(tr. 260)

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

File:

• Singular/iparith.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -1502 +1502 @@
 static BOOLEAN jjCHINREM_BI(leftv res, leftv u, leftv v)
 {
-  if (rField_is_Q())
-  {
-    intvec *c=(intvec*)u->Data();
-    intvec* p=(intvec*)v->Data();
-    int rl=p->length();
-    number *x=(number *)omAlloc(rl*sizeof(number));
-    number *q=(number *)omAlloc(rl*sizeof(number));
-    int i;
-    for(i=rl-1;i>=0;i--)
-    {
-      q[i]=nlInit((*p)[i], NULL);
-      x[i]=nlInit((*c)[i], NULL);
-    }
-    number n=nlChineseRemainder(x,q,rl);
-    for(i=rl-1;i>=0;i--)
-    {
-      nlDelete(&(q[i]),NULL);
-      nlDelete(&(x[i]),NULL);
-    }
-    omFree(x); omFree(q);
-    res->data=(char *)n;
-    return FALSE;
-  }
-  else return TRUE;
+  intvec *c=(intvec*)u->Data();
+  intvec* p=(intvec*)v->Data();
+  int rl=p->length();
+  number *x=(number *)omAlloc(rl*sizeof(number));
+  number *q=(number *)omAlloc(rl*sizeof(number));
+  int i;
+  for(i=rl-1;i>=0;i--)
+  {
+    q[i]=nlInit((*p)[i], NULL);
+    x[i]=nlInit((*c)[i], NULL);
+  }
+  number n=nlChineseRemainder(x,q,rl);
+  for(i=rl-1;i>=0;i--)
+  {
+    nlDelete(&(q[i]),NULL);
+    nlDelete(&(x[i]),NULL);
+  }
+  omFree(x); omFree(q);
+  res->data=(char *)n;
+  return FALSE;
 }
 #endif
@@ -1594 +1590 @@
 static BOOLEAN jjCHINREM_ID(leftv res, leftv u, leftv v)
 {
-  if (rField_is_Q())
+  if ((currRing==NULL) || rField_is_Q())
   {
     lists c=(lists)u->CopyD(); // list of ideal