Changeset fe6b62 in git

Timestamp:

Nov 28, 2014, 7:30:47 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'ec94ef7a30b928574c0c3daf41f6804dff5f6b69')

Children:

12e275d84e2be0f90130dd2c323ad7733f0cc304

Parents:

a3cc3fc3171dee60192b2d6a9f0049cc7bed99a8

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-11-28 19:30:47+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-12-15 18:49:40+01:00

Message:

Removed the definition of convFactoryNSingAN from clapconv.cc in favor of using n_convFactoryNSingN (=nlConvFactoryNSingN in this case)

Location:

libpolys

Files:

• coeffs/longrat.cc (modified) (4 diffs)
• polys/clapconv.cc (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -346 +346 @@
 #endif
 
-CanonicalForm nlConvSingNFactoryN( number n, BOOLEAN setChar, const coeffs /*r*/ )
+static CanonicalForm nlConvSingNFactoryN( number n, const BOOLEAN setChar, const coeffs /*r*/ )
 {
   if (setChar) setCharacteristic( 0 );
@@ -389 +389 @@
 }
 
-number nlConvFactoryNSingN( const CanonicalForm n, const coeffs r)
-{
-  if (n.isImm())
-  {
-    long lz=n.intval();
-    int iz=(int)lz;
+number nlRInit (long i);
+
+static number nlConvFactoryNSingN( const CanonicalForm f, const coeffs r)
+{
+  if (f.isImm())
+  {
+    const long lz=f.intval();
+    const int iz=(int)lz;
     if ((long)iz==lz)
-    {
-      return nlInit(n.intval(),r);
-    }
-    else  return nlRInit(lz);
-    return nlInit(n.intval(),r);
+      return nlInit(f.intval(),r);
+    else
+      return nlRInit(lz);
+//    return nlInit(f.intval(),r);
   }
   else
@@ -408 +409 @@
     z->debug=123456;
 #endif
-    gmp_numerator( n, z->z );
-    if ( n.den().isOne() )
+    gmp_numerator( f, z->z );
+    if ( f.den().isOne() )
       z->s = 3;
     else
     {
-      gmp_denominator( n, z->n );
+      gmp_denominator( f, z->n );
       z->s = 0;
     }
@@ -420 +421 @@
   }
 }
-
-number nlRInit (long i);
 
 static number nlMapR(number from, const coeffs src, const coeffs dst)

libpolys/polys/clapconv.cc

@@ -248 +248 @@
 static number convFactoryNSingAN( const CanonicalForm &f, const ring r)
 {
-  if ( f.isImm() )
-  {
-    long longf=f.intval();
-    int intf=(int) longf;
-    if((long)intf==longf)
-    {
-      assume (r->cf->extRing != NULL);
-      return n_Init(f.intval(),r->cf->extRing->cf);
-    }
-    else return nlRInit( longf );
-  }
-  else
-  {
-    number z=ALLOC_RNUMBER();
-#if defined(LDEBUG)
-    z->debug=123456;
-#endif
-    gmp_numerator( f, z->z );
-    if ( f.den().isOne() )
-    {
-      z->s = 3;
-    }
-    else
-    {
-      gmp_denominator( f, z->n );
-      z->s = 0;
-      nlNormalize(z,r->cf->extRing->cf);
-    }
-    /*#ifdef LDEBUG
-    nlTest(z,r->cf->extRing->cf);
-    #endif*/
-    return z;
-  }
+  assume (r != NULL);
+  assume (r->cf != NULL);
+  assume (r->cf->extRing != NULL);
+  // it seems that r->cf->extRing->cf has to be Q ... ?
+  return n_convFactoryNSingN( f, r->cf->extRing->cf );
 }