Changeset d268a9 in git

Timestamp:

Dec 8, 2000, 6:26:23 PM (23 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4e461ff1df145d7679c725489c921162884348f8

Parents:

b989766c9307859dd7f91bf01c25470f338005bb

Message:

*hannes: conv_ClapPSingP


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

Location:

Singular

Files:

• clapconv.cc (modified) (7 diffs)
• clapconv.h (modified) (2 diffs)

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.31 2000-12-08 13:42:08 Singular Exp $
+// $Id: clapconv.cc,v 1.32 2000-12-08 17:26:22 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -28 +28 @@
 
 static void convRecPP ( const CanonicalForm & f, int * exp, poly & result );
+static void conv_RecPP ( const CanonicalForm & f, int * exp, poly & result, ring r );
 
 static void convRecPTr ( const CanonicalForm & f, int * exp, napoly & result );
@@ -106 +107 @@
 }
 
-CanonicalForm
-convSingPClapP( poly p )
+CanonicalForm conv_SingPClapP( poly p, ring r )
 {
   CanonicalForm result = 0;
-  int e, n = pVariables;
-  assume( rPar(currRing)==0);
+  int e, n = r->N;
+  assume( rPar(r)==0);
 
   while ( p != NULL )
@@ -155 +155 @@
     for ( int i = 1; i <= n; i++ )
     {
-      if ( (e = pGetExp( p, i )) != 0 )
+      if ( (e = p_GetExp( p, i, r )) != 0 )
          term *= power( Variable( i ), e );
     }
@@ -164 +164 @@
 }
 
-poly
-convClapPSingP ( const CanonicalForm & f )
+poly convClapPSingP ( const CanonicalForm & f )
 {
 //    cerr << " f = " << f << endl;
@@ -179 +178 @@
 }
 
-static void
-convRecPP ( const CanonicalForm & f, int * exp, poly & result )
+static void convRecPP ( const CanonicalForm & f, int * exp, poly & result )
 {
   if (f == 0)
@@ -234 +232 @@
     {
       result = pAdd( result, term );
+    }
+  }
+}
+
+poly conv_ClapPSingP ( const CanonicalForm & f, ring r )
+{
+//    cerr << " f = " << f << endl;
+  int n = r->N+1;
+  /* ASSERT( level( f ) <= pVariables, "illegal number of variables" ); */
+  int * exp = new int[n];
+  //for ( int i = 0; i < n; i++ ) exp[i] = 0;
+  memset(exp,0,n*sizeof(int));
+  poly result = NULL;
+  conv_RecPP( f, exp, result, r );
+  delete [] exp;
+  return result;
+}
+
+static void
+conv_RecPP ( const CanonicalForm & f, int * exp, poly & result, ring r )
+{
+  if (f == 0)
+    return;
+  if ( ! f.inCoeffDomain() )
+  {
+    int l = f.level();
+    for ( CFIterator i = f; i.hasTerms(); i++ )
+    {
+      exp[l] = i.exp();
+      conv_RecPP( i.coeff(), exp, result, r );
+    }
+    exp[l] = 0;
+  }
+  else
+  {
+    poly term = p_Init(r);
+    pNext( term ) = NULL;
+    for ( int i = 1; i <= r->N; i++ )
+      p_SetExp( term, i, exp[i], r);
+    if (rRing_has_Comp(r)) p_SetComp(term, 0, r);
+    if ( getCharacteristic() != 0 )
+    {
+      pGetCoeff( term ) = n_Init( f.intval(), r );
+    }
+    else
+    {
+      if ( f.isImm() )
+        pGetCoeff( term ) = n_Init( f.intval(), r );
+      else
+      {
+        number z=(number)omAllocBin(rnumber_bin);
+#if defined(LDEBUG) 
+        z->debug=123456;
+#endif
+        z->z = gmp_numerator( f );
+        if ( f.den() == 1 )
+          z->s = 3;
+        else
+        {
+          z->n = gmp_denominator( f );
+          z->s = 0;
+        }
+        pGetCoeff( term ) = z;
+      }
+    }
+    p_Setm( term, r );
+    if ( n_IsZero(pGetCoeff(term), r) )
+    {
+      p_Delete(&term,r);
+    }
+    else
+    {
+      result = p_Add_q( result, term, r );
     }
   }

Singular/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.10 2000-12-07 12:04:56 Singular Exp $
+// $Id: clapconv.h,v 1.11 2000-12-08 17:26:23 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -20 +20 @@
 
 poly convClapPSingP ( const CanonicalForm & f );
-CanonicalForm convSingPClapP( poly p );
+#define  convSingPClapP(p) conv_SingPClapP(p,currRing)
+
+poly conv_ClapPSingP ( const CanonicalForm & f, ring r );
+CanonicalForm conv_SingPClapP( poly p, ring r );
 
 CanonicalForm convSingAPClapAP ( poly p , const Variable & a );