Changeset 9b2e40 in git

Timestamp:

Jun 13, 2005, 6:23:30 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

a8d0266204146ab7540d16124586c7f957757ea7

Parents:

19fc57bf1d64049e9869d7a195dc56f156f8e197

Message:

*hannes: bifac stuff


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

Location:

kernel

Files:

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

kernel/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.4 2005-04-13 16:38:09 Singular Exp $
+// $Id: clapconv.cc,v 1.5 2005-06-13 16:23:30 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -31 +31 @@
 static void convRecPTr ( const CanonicalForm & f, int * exp, napoly & result );
 
-static void convRecAP ( const CanonicalForm & f, int * exp, poly & result );
-
 static void convRecTrP ( const CanonicalForm & f, int * exp, poly & result, int offs );
 
@@ -462 +460 @@
 }
 
-poly convClapAPSingAP ( const CanonicalForm & f )
-{
-  int n = pVariables+1+1/*rPar(currRing)*/;
+static void
+convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start) ;
+
+poly convClapAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start )
+{
+  int n = pVariables+1+rPar(currRing);
   int * exp = new int[n];
   // for ( int i = 0; i < n; i++ ) exp[i] = 0;
   memset(exp,0,n*sizeof(int));
   poly result = NULL;
-  convRecAP( f, exp, result );
+  convRecAP_R( f, exp, result,par_start, var_start );
   delete [] exp;
   return result;
 }
+poly convClapAPSingAP ( const CanonicalForm & f )
+{
+  return convClapAPSingAP_R(f,0,rPar(currRing));
+}
 
 static void
-convRecAP ( const CanonicalForm & f, int * exp, poly & result )
+convRecAP_R ( const CanonicalForm & f, int * exp, poly & result, int par_start, int var_start )
 {
   if (f == 0)
     return;
-  int off=rPar(currRing);
   if ( ! f.inCoeffDomain() )
   {
@@ -486 +490 @@
     {
       exp[l] = i.exp();
-      convRecAP( i.coeff(), exp, result );
+      convRecAP_R( i.coeff(), exp, result, par_start, var_start );
     }
     exp[l] = 0;
@@ -499 +503 @@
       int i;
       for ( i = 1; i <= pVariables; i++ )
-        pSetExp( term, i , exp[i+off]);
+        pSetExp( term, i , exp[i+var_start]);
       pSetComp(term, 0);
-      for ( i = 1; i <= off; i++ )
+      if (par_start==0)
+      {
+        for ( i = 1; i <= var_start; i++ )
         //z->e[i-1]+=exp[i];
-        napAddExp(z,i,exp[i]);
+          napAddExp(z,i,exp[i]);
+      }
+      else
+      {
+        for ( i = par_start+1; i <= var_start+rPar(currRing); i++ )
+        //z->e[i-1]+=exp[i];
+          napAddExp(z,i,exp[i-par_start]);
+      }
       pGetCoeff(term)=(number)omAlloc0Bin(rnumber_bin);
       ((lnumber)pGetCoeff(term))->z=z;

kernel/clapconv.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.h,v 1.1.1.1 2003-10-06 12:15:50 Singular Exp $
+// $Id: clapconv.h,v 1.2 2005-06-13 16:23:30 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -27 +27 @@
 CanonicalForm convSingAPClapAP ( poly p , const Variable & a );
 poly convClapAPSingAP ( const CanonicalForm & f );
+poly convClapAPSingAP_R ( const CanonicalForm & f, int par_start, int var_start );
 
 CanonicalForm convSingGFClapGF ( poly p );