Changeset 2f573cc in git

Timestamp:

Oct 12, 2010, 11:45:58 AM (14 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

cd3dd1380fd4640bedd9c9aadf0c15e9113e7a9c

Parents:

e31d298046b3c48cd4d618071c9f63b60c561667

Message:

new system function "factoras" to factorize over multiple extensions


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

Files:

• Singular/extra.cc (modified) (2 diffs)
• libfac/charset/alg_factor.cc (modified) (1 diff)
• libfac/charset/alg_factor.h (modified) (1 diff)
• libfac/factor.h (modified) (1 diff)

Singular/extra.cc

@@ -127 +127 @@
 #include <kernel/clapconv.h>
 #include <kernel/kstdfac.h>
+#include <factor.h>
 #endif
 #include <kernel/clapsing.h>
@@ -3370 +3371 @@
       }
       else
+  /*================= factoras =========================*/
+      if (strcmp (sys_cmd, "factoras") == 0)
+      {
+        if (h!=NULL && (h->Typ()== POLY_CMD) && (h->next->Typ() == IDEAL_CMD))
+        {
+          CanonicalForm F( convSingTrPFactoryP((poly)(h->Data())));
+          h= h->next;
+          ideal I= ((ideal) h->Data());
+          int i= IDELEMS (I);
+          CFList as;
+          for (int j= 0; j < i; j++)
+            as.append (convSingTrPFactoryP (I->m[j]));
+          int success= 0;
+          CFFList libfacResult= newfactoras (F, as, success);
+          if (success >= 0)
+          {
+            //convert factors
+            ideal factors= idInit(libfacResult.length(),1);
+            CFFListIterator j= libfacResult;
+            i= 0;
+            intvec *mult= new intvec (libfacResult.length());
+            for ( ; j.hasItem(); j++,i++ )
+            {
+              factors->m[i]= convFactoryPSingTrP (j.getItem().factor());
+              (*mult)[i]= j.getItem().exp();
+            }
+            lists l= (lists)omAllocBin( slists_bin);
+            l->Init(2);
+            l->m[0].rtyp= IDEAL_CMD;
+            l->m[0].data= (char *) factors;
+            l->m[1].rtyp= INTVEC_CMD;
+            l->m[1].data= (char *) mult;
+            res->data= l;
+            res->rtyp= LIST_CMD;
+            if (success == 0)
+              WerrorS ("factorization maybe incomplete");
+            return FALSE;
+          }
+          else
+          {
+            WerrorS("problem in libfac");
+            return TRUE;
+          }
+        }
+        else
+        {
+          WerrorS("`system(\"factoras\",<poly>,<ideal>) expected");
+          return TRUE;
+        }
+      }
+      else
   #endif
   #ifdef ix86_Win

libfac/charset/alg_factor.cc

@@ -811 +811 @@
 
 CFFList
-newcfactor(const CanonicalForm & f, const CFList & as, int success ){
+newcfactor(const CanonicalForm & f, const CFList & as, int & success ){
   Off(SW_RATIONAL);
   CFFList Output, output, Factors=Factorize(f); On(SW_RATIONAL);

libfac/charset/alg_factor.h

@@ -28 +28 @@
 
 CFFList newfactoras( const CanonicalForm & f, const CFList & as, int &success);
-CFFList newcfactor(const CanonicalForm & f, const CFList & as, int success );
 /*BEGINPUBLIC*/
+CFFList newcfactor(const CanonicalForm & f, const CFList & as, int & success );
 /*ENDPUBLIC*/
 

libfac/factor.h

@@ -22 +22 @@
 CFFList Factorize2(CanonicalForm F, const CanonicalForm & minpoly );
 CFFList newfactoras( const CanonicalForm & f, const CFList & as, int &success);
+CFFList newcfactor( const CanonicalForm & f, const CFList & as, int &success);
 
 //// Note: InternalSqrFree does only the work needed for factorization.