Changeset 47b559d in git for Singular/extra.cc

Timestamp:

Dec 2, 2010, 12:37:29 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2f2562016613663d129949817c3520b92f72c095

Parents:

35715cbb715ef8f8977fca4b923054147968c0d1

Message:

finished hensel factorization (provided as sys command in extra.cc)

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

File:

• Singular/extra.cc (modified) (2 diffs)

Singular/extra.cc

@@ -633 +633 @@
       if(strcmp(sys_cmd, "henselfactors")==0)
       {
-        if ((h != NULL) && (h->Typ() == POLY_CMD) &&
-            (h->next != NULL) && (h->next->Typ() == POLY_CMD) &&
+        if ((h != NULL) && (h->Typ() == INT_CMD) &&
+            (h->next != NULL) && (h->next->Typ() == INT_CMD) &&
             (h->next->next != NULL) && (h->next->next->Typ() == POLY_CMD) &&
             (h->next->next->next != NULL) &&
-                                     (h->next->next->next->Typ() == INT_CMD))
-        {
-          poly hh = (poly)h->Data();
-          poly f0 = (poly)h->next->Data();
-          poly g0 = (poly)h->next->next->Data();
-          int d   = (int)(long)h->next->next->next->Data();
+               (h->next->next->next->Typ() == POLY_CMD) &&
+            (h->next->next->next->next != NULL) &&
+               (h->next->next->next->next->Typ() == POLY_CMD) &&
+            (h->next->next->next->next->next != NULL) &&
+               (h->next->next->next->next->next->Typ() == INT_CMD) &&
+            (h->next->next->next->next->next->next == NULL))
+        {
+          int xIndex = (int)(long)h->Data();
+          int yIndex = (int)(long)h->next->Data();
+          poly hh    = (poly)h->next->next->Data();
+          poly f0    = (poly)h->next->next->next->Data();
+          poly g0    = (poly)h->next->next->next->next->Data();
+          int d      = (int)(long)h->next->next->next->next->next->Data();
           poly f; poly g;
-          henselFactors(hh, f0, g0, d, f, g);
+          henselFactors(xIndex, yIndex, hh, f0, g0, d, f, g);
           lists L = (lists)omAllocBin(slists_bin);
           L->Init(2);
@@ -655 +662 @@
         else
         {
-          Werror( "expected argument list (poly, poly, poly, int)");
+          Werror( "expected argument list (int, int, poly, poly, poly, int)");
           return TRUE;
         }