Changeset a917c9 in git

Timestamp:

Nov 27, 2009, 10:31:46 AM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

695a2d025f8cca3a2a5725e892f18e7a8dc5c5fb

Parents:

b1e9282c33e2c6c99a830d3ac17d9adf89bf8232

Message:

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

Location:

Singular-vanishing-ideal

Files:

• FactoredNumber.cc (added)
• FactoredNumber.h (added)
• Makefile.in (modified) (1 diff)
• VanishingIdeal.cc (added)
• VanishingIdeal.h (added)
• claptmpl.cc (modified) (1 diff)
• extra.cc (modified) (2 diffs)

Singular-vanishing-ideal/Makefile.in

@@ -175 +175 @@
     walk.cc walk_ip.cc \
     cntrlc.cc misc.cc \
-    calcSVD.cc
+    calcSVD.cc \
+    VanishingIdeal.cc \
+    FactoredNumber.cc
 
 # stuff for MP

Singular-vanishing-ideal/claptmpl.cc

@@ -256 +256 @@
 template void noro_step<tgb_uint32>(poly*p,int &pn,slimgb_alg* c);
 //std::priority_queue<MonRedRes>
+#ifdef HAVE_VANISHING_IDEAL
+#include <list>
+template class std::list<int>;
+#endif /* HAVE_VANISHING_IDEAL */
 #endif
 //template int pos_helper(kStrategy strat, poly p, int len, intset setL, polyset set);

Singular-vanishing-ideal/extra.cc

@@ -159 +159 @@
 //#include <python_wrapper.h>
 #endif
+
+#ifdef HAVE_VANISHING_IDEAL
+#include "VanishingIdeal.h"
+#endif // HAVE_VANISHING_IDEAL
 
 void piShowProcList();
@@ -2237 +2241 @@
     else
 #endif
+/*==================== vanishing ideal ======================*/
+#ifdef HAVE_VANISHING_IDEAL
+    if (strcmp(sys_cmd, "vanishingIdeal") == 0)
+    {
+      if ((h->Typ()       == STRING_CMD) &&
+          (h->next->Typ() == INT_CMD)    &&
+          (h->next->next  == NULL))
+      {
+        const char* mode                  = (const char*)     h->Data();
+        const int   printOperationDetails = (const int)(long) h->next->Data();
+        res->rtyp = IDEAL_CMD;
+        if      (strcmp(mode, "direct")    == 0)
+          res->data = gBForVanishingIdealDirect(printOperationDetails != 0 ? true : false);
+        else if (strcmp(mode, "recursive") == 0)
+          res->data = gBForVanishingIdealRecursive(printOperationDetails != 0 ? true : false);
+        else
+        {
+          PrintS("invalid usage: expected string parameter = 'direct' or 'recursive'"); PrintLn();
+          res->rtyp = INT_CMD;
+          res->data = 0;
+        }
+      }
+      else if ((h->Typ()             == STRING_CMD) &&
+               (h->next->Typ()       == POLY_CMD)   &&
+               (h->next->next->Typ() == INT_CMD)    &&
+               (h->next->next->next  == NULL))
+      {
+        const char* mode                  = (const char*)     h->Data();
+        const poly  f                     = (const poly)      h->next->Data();
+        const int   printOperationDetails = (const int)(long) h->next->next->Data();
+        if      (strcmp(mode, "normalForm") == 0)
+        {
+          res->rtyp = POLY_CMD;
+          res->data = normalForm(f, printOperationDetails != 0 ? true : false);
+        }
+        else if (strcmp(mode, "isZeroFunction") == 0)
+        {
+          res->rtyp = INT_CMD;
+          res->data = (void*)(long)(isZeroFunction(f, printOperationDetails != 0 ? true : false) ? 1 : 0);
+        }
+        else
+        {
+          PrintS("invalid usage: expected string parameter = 'normalForm' or 'isZeroFunction'"); PrintLn();
+          res->rtyp = INT_CMD;
+          res->data = 0;
+        }
+      }
+      else if ((h->Typ()       == INT_CMD) &&
+               (h->next->Typ() == INT_CMD) &&
+               (h->next->next  == NULL))
+      {
+        const int m                     = (const int)(long) h->Data();
+        const int printOperationDetails = (const int)(long) h->next->Data();
+        res->rtyp = INT_CMD;
+        if (m >= 1)
+          res->data = (void*)(long)smarandache(m, printOperationDetails != 0 ? true : false);
+        else
+        {
+          PrintS("invalid usage: expected positive integer"); PrintLn();
+          res->data = 0;
+        }
+      }
+      return FALSE;
+    }
+    else
+#endif
 /*==================== pDivStat =============================*/
 #if defined(PDEBUG) || defined(PDIV_DEBUG)