Changeset ce7a6ad in git

Timestamp:

Jan 20, 2002, 10:20:19 AM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

b8490e74a539f406ed4238becdea28121774e338

Parents:

959ad237d1cd4759153762c28484900baf52ec96

Message:

*hannes: port of 2-0 changes


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

File:

• Singular/clapsing.cc (modified) (7 diffs)

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.78 2001-08-27 14:46:49 Singular Exp $
+// $Id: clapsing.cc,v 1.79 2002-01-20 09:20:19 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -23 +23 @@
 #ifdef HAVE_LIBFAC_P
 #include <factor.h>
+CanonicalForm algcd(const CanonicalForm & F, const CanonicalForm & g, const CFList & as, const Varlist & order);
+
 #endif
 #include "ring.h"
@@ -206 +208 @@
   if (f==NULL) return pCopy(g); // f==0 => gcd=g (but do a pCleardenom)
 
+  if (pIsConstant(f) || pIsConstant(g)) return pOne();
+
   // for now there is only the possibility to handle polynomials over
   // Q and Fp ...
@@ -226 +230 @@
       if ( nGetChar()==1 ) /* Q(a) */
       {
-        WerrorS( feNotImplemented );
+      //  WerrorS( feNotImplemented );
+        CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+        Varlist ord;
+        ord.append(mipo.mvar()); 
+        CFList as(mipo);
+        Variable a=rootOf(mipo);
+        CanonicalForm F( convSingAPClapAP( f,a ) ), G( convSingAPClapAP( g,a ) );
+        res= convClapAPSingAP( algcd( F, G, as, ord) );
       }
       else
@@ -1046 +1057 @@
   loop
   {
+    BOOLEAN done=TRUE;
     i=Li.getItem()-1;
     mark[i]=1;
     if (i<offs)
     {
-      StringAppendS(currRing->parameter[i]);
+      done=FALSE;
+      //StringAppendS(currRing->parameter[i]);
     }
     else
@@ -1059 +1072 @@
     cnt--;
     if(cnt==0) break;
-    StringAppendS(",");
+    if (done) StringAppendS(",");
     if(! Li.hasItem()) break;
   }
   for(i=0;i<pVariables+offs;i++)
   {
+    BOOLEAN done=TRUE;
     if(mark[i]==0)
     {
       if (i<offs)
       {
-        StringAppendS(currRing->parameter[i]);
+        done=FALSE;
+        //StringAppendS(currRing->parameter[i]);
       }
       else
@@ -1076 +1091 @@
       cnt--;
       if(cnt==0) break;
-      StringAppendS(",");
-    }
-  }
-  return omStrDup(StringAppendS(""));
+      if (done) StringAppendS(",");
+    }
+  }
+  char * s=omStrDup(StringAppendS(""));
+  if (s[strlen(s)-1]==',') s[strlen(s)-1]='\0';
+  return s;
 #else
   return NULL;