Changeset 95a6f3 in git for Singular/extra.cc

Timestamp:

Oct 9, 2009, 3:46:30 PM (15 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

60e4be265398f8004f3b093179a74b59f4fdcb74

Parents:

70f63ab39d1a6a435e42e041336a21e13c1269d9

Message:

more functionality: compute int minors modulo p


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

File:

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

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.324 2009-10-09 09:05:18 seelisch Exp $ */
+/* $Id: extra.cc,v 1.325 2009-10-09 13:46:30 seelisch Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -2147 +2147 @@
             // 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 200 entries and a maximum total
-            // number of 10000 cached monomials;
+            // entries);
             // when calling this method, a ring must be declared before;
-            // there will be a run without using a cache; afterwards all 5
-            // caching strategies will be run
+            // there will be one run using a cache with specified properties
+          res->rtyp = IDEAL_CMD;
+          res->data = iii;
+        }
+        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 == NULL))
+        {
+          const matrix m           = (const matrix)h->Data();
+          const int k              = (const int)(long)h->next->Data();
+          const int strategy       = (const int)(long)h->next->next->Data();
+          const int cacheEntries   = (const int)(long)h->next->next->next->Data();
+          const int cacheWeight    = (const int)(long)h->next->next->next->next->Data();
+          const int characteristic = (const int)(long)h->next->next->next->next->next->Data();
+          ideal iii = testAllIntMinorsAsIdeal(m, k, strategy, cacheEntries, cacheWeight, characteristic);
+            // starts the computation of all k x k minors in the
+            // provided matrix m (which is assumed to have integer
+            // entries);
+            // when calling this method, a ring must be declared before;
+            // there will be one run using a cache with specified properties;
+            // the resulting minors will be computed modulo the given characteristic
           res->rtyp = IDEAL_CMD;
           res->data = iii;
@@ -2162 +2184 @@
                  (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))
+                 (h->next->next->next->next->next->next->next->Typ() == INT_CMD) &&
+                 (h->next->next->next->next->next->next->next->next == NULL))
         {
           const matrix m           = (const matrix)h->Data();