Changeset f2b6f0b in git for kernel/clapconv.cc

Timestamp:

Mar 11, 2011, 4:44:00 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

526c7a0339cc1389327b6890ee660bf4e305a2bd

Parents:

55b168742289691f8d1b35cb10dd7eae24b73c9d

Message:

fix for tr 260

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

File:

• kernel/clapconv.cc (modified) (4 diffs)

kernel/clapconv.cc

@@ -45 +45 @@
   CanonicalForm term;
   /* does only work for Zp, Q */
-  if ( getCharacteristic() != 0 )
-  {
-    term = npInt( n,r );
-  }
-  else
+  if ((r==NULL) || rField_is_Q(r))
   {
     if ( SR_HDL(n) & SR_INT )
@@ -74 +70 @@
     }
   }
+  else /*if ( (r!=NULL) && rField_is_Zp(r) ) */
+  {
+    term = npInt( n,r );
+  }
   return term;
 }
 
-number convFactoryNSingN( const CanonicalForm & n)
+number convFactoryNSingN( const CanonicalForm & n, const ring r)
 {
   if (n.isImm())
-    return nInit(n.intval());
+  {
+    if (r==NULL) return nlInit(n.intval(),NULL);
+    else         return n_Init(n.intval(),r);
+  }
   else
   {
@@ -99 +102 @@
   }
 }
+
+//number convFactoryNSingN( const CanonicalForm & n)
+//{
+//  return convFactoryNSingN(n,currRing);
+//}
+
 
 poly convFactoryPSingP ( const CanonicalForm & f, const ring r )
@@ -482 +491 @@
   for(i=rl-1;i>=0;i--)
   {
-    X[i]=convSingNFactoryN(x[i],currRing); // may be larger MAX_INT
-    Q[i]=convSingNFactoryN(q[i],currRing); // may be larger MAX_INT
+    X[i]=convSingNFactoryN(x[i],NULL); // may be larger MAX_INT
+    Q[i]=convSingNFactoryN(q[i],NULL); // may be larger MAX_INT
   }
   CanonicalForm xnew,qnew;
   chineseRemainder(X,Q,xnew,qnew);
-  number n=convFactoryNSingN(xnew);
-  number p=convFactoryNSingN(qnew);
-  number p2=nlIntDiv(p,nlInit(2, currRing));
+  number n=convFactoryNSingN(xnew,NULL);
+  number p=convFactoryNSingN(qnew,NULL);
+  number p2=nlIntDiv(p,nlInit(2, NULL));
   if (nlGreater(n,p2))
   {
      number n2=nlSub(n,p);
-     nlDelete(&n,currRing);
+     nlDelete(&n,NULL);
      n=n2;
   }
-  nlDelete(&p,currRing);
-  nlDelete(&p2,currRing);
+  nlDelete(&p,NULL);
+  nlDelete(&p2,NULL);
   return n;
 #else