Changeset b0d3903 in git

Timestamp:

Sep 17, 2009, 12:27:37 PM (15 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

781efb3cc0d623f637f1f685201321e33f76479b

Parents:

f27faea2f43b620270775371aaac8a515a32509d

Message:

changes for incorporation of test code (minors and C++ wrappers)


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

Location:

Singular

Files:

• Makefile.in (modified) (1 diff)
• claptmpl.cc (modified) (2 diffs)
• extra.cc (modified) (5 diffs)

Singular/Makefile.in

@@ -175 +175 @@
     walk.cc walk_ip.cc \
     cntrlc.cc misc.cc \
-    calcSVD.cc
+    calcSVD.cc \
+    CanonicalPoly.cc \
+    ObjectFactory.cc \
+    Poly.cc \
+    ReferenceCounter.cc \
+    Wrappers.cc \
+    TestMinors.cc \
+    MinorProcessor.cc \
+    Minor.cc
 
 # stuff for MP

Singular/claptmpl.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: claptmpl.cc,v 1.45 2009-08-14 11:15:34 Singular Exp $
+// $Id: claptmpl.cc,v 1.46 2009-09-17 10:27:36 seelisch Exp $
 /*
 * ABSTRACT - instantiation of all templates
@@ -256 +256 @@
 template void noro_step<tgb_uint32>(poly*p,int &pn,slimgb_alg* c);
 //std::priority_queue<MonRedRes>
+//
+// begin of template declarations for minor code (Frank Seelisch)
+#include <list>
+#include "Minor.h"
+#include "Cache.h"
+template class std::list<int>;
+template class std::list<MinorKey>;
+template class std::list<LongMinorValue>;
+template class std::list<PolyMinorValue>;
+template class Cache<MinorKey, LongMinorValue>;
+template class Cache<MinorKey, PolyMinorValue>;
+// end of template declarations for minor code (Frank Seelisch)
 #endif
 //template int pos_helper(kStrategy strat, poly p, int len, intset setL, polyset set);

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.315 2009-08-30 15:45:43 ederc Exp $ */
+/* $Id: extra.cc,v 1.316 2009-09-17 10:27:37 seelisch Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -54 +54 @@
 #include "prCopy.h"
 #include "mpr_complex.h"
+#include "Wrappers.h" // for testing C++ wrappers (Frank Seelisch)
+#include "TestMinors.h" // for testing minor code (Frank Seelisch)
 #include "ffields.h" // test GF only
 
@@ -2094 +2096 @@
       else
 #endif
+/*==================== debug C++ wrappers (Frank Seelisch) ========================*/
+      if(strcmp(sys_cmd,"c++wrappers")==0)
+      {
+        testWrappers();
+        return FALSE;
+      }
+      else
+/*==================== debug minor code (Frank Seelisch) ========================*/
+      if(strcmp(sys_cmd,"minors")==0)
+      {
+        if (h == NULL) minorUsageInfo();  /* writes some info to the console
+                                             on how to use this experimental code
+                                          */
+        else if (h->Typ() == INT_CMD)
+        {
+           testIntMinors(0);  /* effectively no arguments provided:
+                                 this starts 5 default tests
+                                 with a random matrix with
+                                 integer entries;
+                                 for that, no ring needs to be
+                                 declared
+                              */
+        }
+        else if ((h->Typ() == MATRIX_CMD) &&
+                 (h->next->Typ() == INT_CMD) &&
+                 (h->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->next->next->next->Typ() == INT_CMD))
+        {
+          const matrix m          = (const matrix)h->Data();
+          const int k             = (const int)h->next->Data();
+          const int cacheEntries  = (const int)h->next->next->Data();
+          const int cacheWeight   = (const int)h->next->next->next->Data();
+          const int strategies    = (const int)h->next->next->next->next->Data();
+          const int dumpMinors    = (const int)h->next->next->next->next->next->Data();
+          const int dumpResults   = (const int)h->next->next->next->next->next->next->Data();
+          const int dumpComplete  = (const int)h->next->next->next->next->next->next->next->Data();
+          const int dumpConsole   = (const int)h->next->next->next->next->next->next->next->next->Data();
+          testAllPolyMinors(m, k, cacheEntries, cacheWeight, strategies, dumpMinors, dumpResults, dumpComplete, dumpConsole);
+            /* starts the computation of all k x k minors in the
+               provided matrix m (which is assumed to have polynomial
+               entries) using a cache with a maximum number of
+               'cacheEntries' entries and a maximum weight of 'cacheWeight';
+               when calling this method, a ring must be declared before;
+               strategy = "310" means that the code is run first without a
+               cache ("0") and then afterwards with the caching strategies
+               1 and 3
+            */
+        }
+        else if (h->Typ() == POLY_CMD)
+        { // for quick tests
+          const poly p = (const poly)h->Data();
+          testStuff(p);
+        }
+        return FALSE;
+      }
+      else
 /*==================== generic debug ==================================*/
 //#ifdef PDEBUG
@@ -2680 +2742 @@
         opt = 2;
       }
-      h = h->next;
-      int termination;
-      if(h != NULL) {
-        termination = (int) (long) h->Data();
-      }
-      else {
-        termination = 0;
-      }res->rtyp=IDEAL_CMD;
-      res->data=(ideal) F5main(G,r,opt,termination);
+      res->rtyp=IDEAL_CMD;
+      res->data=(ideal) F5main(G,r,opt);
       return FALSE;
     }
@@ -3297 +3352 @@
 #endif // HAVE_SINGULAR_PLUS_PLUS
 
+    if (strcmp(sys_cmd,"FrankTest")==0)
+  {
+    PrintS("Hell Or Word!");
+    return FALSE;
+  };
 
 #ifdef HAVE_GFAN