Changeset 7049b2 in git

Timestamp:

Dec 8, 2000, 1:47:37 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

2639fd85c62e265b9d5351a9fd025336832879df

Parents:

6aef97b3678a5fb25e12017e60d3dea6563d2494

Message:

*hannes: napSetExp


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

File:

• Singular/clapconv.cc (modified) (12 diffs)

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.29 2000-12-06 11:03:08 Singular Exp $
+// $Id: clapconv.cc,v 1.30 2000-12-08 12:47:37 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -25 +25 @@
 static void convRec( const CanonicalForm & f, int * exp, poly & result );
 
-static void convRecAlg( const CanonicalForm & f, int * exp, alg & result );
+static void convRecAlg( const CanonicalForm & f, int * exp, napoly & result );
 
 static void convRecPP ( const CanonicalForm & f, int * exp, poly & result );
 
-static void convRecPTr ( const CanonicalForm & f, int * exp, alg & result );
+static void convRecPTr ( const CanonicalForm & f, int * exp, napoly & result );
 
 static void convRecAP ( const CanonicalForm & f, int * exp, poly & result );
@@ -240 +240 @@
 
 CanonicalForm
-convSingTrClapP( alg p )
+convSingTrClapP( napoly p )
 {
   CanonicalForm result = 0;
@@ -299 +299 @@
 }
 
-alg
+napoly
 convClapPSingTr ( const CanonicalForm & f )
 {
@@ -308 +308 @@
   // for ( int i = 0; i < n; i++ ) exp[i] = 0;
   memset(exp,0,n*sizeof(int));
-  alg result = NULL;
+  napoly result = NULL;
   convRecPTr( f, exp, result );
   delete [] exp;
@@ -315 +315 @@
 
 static void
-convRecPTr ( const CanonicalForm & f, int * exp, alg & result )
+convRecPTr ( const CanonicalForm & f, int * exp, napoly & result )
 {
   if (f == 0)
@@ -331 +331 @@
   else
   {
-    alg term = napNew();
+    napoly term = napNew();
     // napNext( term ) = NULL; //already done by napNew
     for ( int i = 1; i <= napVariables; i++ )
-      napGetExp( term, i ) = exp[i];
+      napSetExp( term, i , exp[i]);
     if ( getCharacteristic() != 0 )
     {
@@ -426 +426 @@
   else
   {
-    alg z=(alg)convClapASingA( f );
+    napoly z=(napoly)convClapASingA( f );
     if (z!=NULL)
     {
@@ -435 +435 @@
         pSetExp( term, i , exp[i+off]);
       pSetComp(term, 0);
-      for ( i = 0; i < off; i++ )
-        z->e[i]+=exp[i+1];
+      for ( i = 1; i <= off; i++ )
+        //z->e[i-1]+=exp[i];
+        napAddExp(z,i,exp[i]);
       pGetCoeff(term)=(number)omAlloc0Bin(rnumber_bin);
       ((lnumber)pGetCoeff(term))->z=z;
@@ -445 +446 @@
 }
 
-CanonicalForm convSingAClapA ( alg p , const Variable & a )
+CanonicalForm convSingAClapA ( napoly p , const Variable & a )
 {
   CanonicalForm result = 0;
@@ -529 +530 @@
 }
 
-alg convClapASingA ( const CanonicalForm & f )
-{
-  alg a=NULL;
-  alg t;
+napoly convClapASingA ( const CanonicalForm & f )
+{
+  napoly a=NULL;
+  napoly t;
   for( CFIterator i=f; i.hasTerms(); i++)
   {
@@ -540 +541 @@
     if (nacIsZero(napGetCoeff(t)))
     {
-      napDelete(&t);
-    }
-    else
-    {
-      napGetExp(t,1)=i.exp();
+      p_Delete(&t, currRing->algring);
+    }
+    else
+    {
+      napSetExp(t,1,i.exp());
       a=napAdd(a,t);
     }