Changeset 3d6c38 in git for kernel/clapconv.cc

Timestamp:

Aug 5, 2009, 7:29:44 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f60485dae160ea69a455571578bb2877fbc73226

Parents:

91d0e6160c27d70513b2d48ed1829a64a7f84780

Message:

*hannes: code cleanup (longalg.h)


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

File:

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

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.12 2008-12-17 15:07:46 Singular Exp $
+// $Id: clapconv.cc,v 1.13 2009-08-05 17:28:16 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -227 +227 @@
 {
   CanonicalForm result = 0;
-  int e, n = napVariables;
+  int e, n = rPar(currRing);
 
   while ( p!=NULL)
@@ -235 +235 @@
     if ( getCharacteristic() != 0 )
     {
-      term = npInt( napGetCoeff( p ) );
-    }
-    else
-    {
-      if ( SR_HDL(napGetCoeff( p )) & SR_INT )
-        term = SR_TO_INT( napGetCoeff( p ) );
+      term = npInt( pGetCoeff( p ) );
+    }
+    else
+    {
+      if ( SR_HDL(pGetCoeff( p )) & SR_INT )
+        term = SR_TO_INT( pGetCoeff( p ) );
       else
       {
-        if ( napGetCoeff( p )->s == 3 )
+        if ( pGetCoeff( p )->s == 3 )
         {
           MP_INT dummy;
-          mpz_init_set( &dummy, &(napGetCoeff( p )->z) );
+          mpz_init_set( &dummy, &(pGetCoeff( p )->z) );
           term = make_cf( dummy );
         }
@@ -254 +254 @@
           MP_INT num, den;
           On(SW_RATIONAL);
-          mpz_init_set( &num, &(napGetCoeff( p )->z) );
-          mpz_init_set( &den, &(napGetCoeff( p )->n) );
-          term = make_cf( num, den, ( napGetCoeff( p )->s != 1 ));
+          mpz_init_set( &num, &(pGetCoeff( p )->z) );
+          mpz_init_set( &den, &(pGetCoeff( p )->n) );
+          term = make_cf( num, den, ( pGetCoeff( p )->s != 1 ));
         }
       }
@@ -262 +262 @@
     for ( int i = n; i >0; i-- )
     {
-      if ( (e = napGetExp( p, i )) != 0 )
+      if ( (e = p_GetExp( p, i, currRing->algring )) != 0 )
         term *= power( Variable( i ), e );
     }
     result += term;
-    p = napNext( p );
+    pIter( p );
   }
   return result;
@@ -274 +274 @@
 {
 //    cerr << " f = " << f << endl;
-  int n = napVariables+1;
-  /* ASSERT( level( f ) <= napVariables, "illegal number of variables" ); */
+  int n = rPar(currRing)+1;
+  /* ASSERT( level( f ) <= rPar(currRing), "illegal number of variables" ); */
   int * exp = (int *)omAlloc0(n*sizeof(int));
   napoly result = NULL;
@@ -301 +301 @@
     napoly term = napNew();
     // napNext( term ) = NULL; //already done by napNew
-    for ( int i = 1; i <= napVariables; i++ )
-      napSetExp( term, i , exp[i]);
+    for ( int i = rPar(currRing); i>=1; i-- )
+      p_SetExp( term, i , exp[i],currRing->algring);
+    p_Setm(term, currRing->algring);
     if ( f.isImm() )
-      napGetCoeff( term ) = nacInit( f.intval() );
+      pGetCoeff( term ) = n_Init( f.intval(), currRing->algring );
     else
     {
@@ -327 +328 @@
         {
           z->s = 0;
-          nacNormalize(z);
-        }
-      }
-      napGetCoeff( term ) = z;
-    }
-    if (nacIsZero(pGetCoeff(term)))
+          n_Normalize(z,currRing->algring);
+        }
+      }
+      pGetCoeff( term ) = z;
+    }
+    if (n_IsZero(pGetCoeff(term),currRing->algring))
     {
       napDelete(&term);
@@ -474 +475 @@
 {
   if ( f.isImm() )
-    return nacInit( f.intval() );
+    return n_Init( f.intval(), currRing->algring );
   else
   {
@@ -508 +509 @@
     // napNext( t ) = NULL; //already done by napNew
     napGetCoeff(t)=convFactoryNSingAN( i.coeff() );
-    if (nacIsZero(napGetCoeff(t)))
+    if (n_IsZero(napGetCoeff(t),currRing->algring))
     {
       napDelete(&t);