Changeset 16a86e in git

Timestamp:

Oct 6, 2009, 2:09:00 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

58aa9c9e7cce5179cb2dc91516a79b6e0b352a96

Parents:

e070895e98cba72b2d19d9f11f5ec2edc262c1d6

Message:

some more fixes to make the code link on compute servers (64bit)


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

Location:

Singular

Files:

• Minor.cc (modified) (2 diffs)
• Minor.h (modified) (4 diffs)
• TestMinors.cc (modified) (4 diffs)
• claptmpl.cc (modified) (2 diffs)
• extra.cc (modified) (3 diffs)

Singular/Minor.cc

@@ -675 +675 @@
 int MinorValue::_RankingStrategy = -1;
 
+long MinorValue::getWeight () const
+{
+  assert(false);  // must be overridden in derived classes
+  return 0;
+}
+
 // just to make the compiler happy;
 // this method should never be called
@@ -680 +686 @@
     assert(false);
     return (this == &mv);  // compare addresses of both objects
+}
+
+string MinorValue::toString () const
+{
+  assert(false);  // must be overridden in derived classes
+  return "";
 }
 

Singular/Minor.h

@@ -1 @@
-#ifndef Minor_H
-#define Minor_H
+#ifndef MINOR_H
+#define MINOR_H
 
 #ifdef HAVE_MINOR
@@ -459 +459 @@
              * @see Cache::getWeight () const
              */
-             virtual long getWeight () const {};
+             virtual long getWeight () const;
 
              /**
@@ -564 +564 @@
              * @return a printable version of the given instance as instance of class string
              */
-             virtual string toString () const {};
+             virtual string toString () const;
 
              /**
@@ -677 +677 @@
 
 #endif
-/* Minor_H */
+/* MINOR_H */

Singular/TestMinors.cc

@@ -329 +329 @@
 ideal testAllPolyMinorsAsIdeal(matrix mat, int minorSize, int strategy, int cacheEntries, long cacheWeight)
 {
+    // counters + auxiliary stuff
+  long totalMultiplications = 0;
+  long totalAdditions = 0;
+  long totalMultiplicationsAccumulated = 0;
+  long totalAdditionsAccumulated = 0;
+  char h[30];
+
   int rowCount = mat->nrows;
   int columnCount = mat->ncols;
@@ -351 +358 @@
   PolyMinorValue theMinor;
   poly po;
-  int nonZeroCounter = 0;
-  std::list<poly> generators;
+  ideal iii = idInit(nonZeroCounter, 0);
 
   if (strategy == 0)
   {
+    PrintLn(); PrintS("new code uses no cache");
     // iteration over all minors of size "minorSize x minorSize"
     while (mp.hasNextMinor()) {
@@ -361 +368 @@
       theMinor = mp.getNextMinor();
       po = theMinor.getResult();
-      if (!pEqualPolys(po, zeroPoly))
-      {
-        nonZeroCounter++;
-        generators.insert(generators.end(), po);
-      }
+      totalMultiplicationsAccumulated += theMinor.getAccumulatedMultiplications();
+      totalMultiplications += theMinor.getMultiplications();
+      totalAdditionsAccumulated += theMinor.getAccumulatedAdditions();
+      totalAdditions += theMinor.getAdditions();
+      idInsertPoly(iii, po); // will include po only if it is not the zero polynomial
     }
   }
   else
   {
+    PrintLn(); PrintS("new code uses cache with caching strategy ");
+    sprintf(h, "%d", strategy); PrintS(h);
     MinorValue::SetRankingStrategy(strategy);
     Cache<MinorKey, PolyMinorValue> cch(cacheEntries, cacheWeight);
@@ -377 +386 @@
       theMinor = mp.getNextMinor(cch);
       po = theMinor.getResult();
-      if (!pEqualPolys(po, zeroPoly))
-      {
-        nonZeroCounter++;
-        generators.insert(generators.end(), po);
-      }
+      totalMultiplicationsAccumulated += theMinor.getAccumulatedMultiplications();
+      totalMultiplications += theMinor.getMultiplications();
+      totalAdditionsAccumulated += theMinor.getAccumulatedAdditions();
+      totalAdditions += theMinor.getAdditions();
+      idInsertPoly(iii, po); // will include po only if it is not the zero polynomial
     }
   }
-
-  // build the return value, i.e. the ideal of non-zero minors
-  ideal iii = idInit(nonZeroCounter, 0);
-  int i = 0;
-  for (std::list<poly>::iterator it = generators.begin(); it != generators.end(); it++)
-  {
-    iii->m[i] = *it;
-    i++;
-  }
+  
+  PrintLn(); PrintS("numbers of performed operations");
+  PrintLn(); PrintS("   polynomial-to-polynomial multiplications: ");
+  sprintf(h, "%ld", totalMultiplications); PrintS(h);
+  PrintLn(); PrintS("   polynomial-to-polynomial additions: ");
+  sprintf(h, "%ld", totalAdditions); PrintS(h);
+  PrintLn(); PrintS("   (polynomial-to-polynomial multiplications without cache would be: ");
+  sprintf(h, "%ld", totalMultiplicationsAccumulated); PrintS(h); PrintS(")");
+  PrintLn(); PrintS("   (polynomial-to-polynomial additions without cache would be: ");
+  sprintf(h, "%ld", totalAdditionsAccumulated); PrintS(h); PrintS(")");
+  PrintLn(); PrintLn();
+
   return iii;
 }

Singular/claptmpl.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: claptmpl.cc,v 1.48 2009-10-02 13:51:19 seelisch Exp $
+// $Id: claptmpl.cc,v 1.49 2009-10-06 12:09:00 seelisch Exp $
 /*
 * ABSTRACT - instantiation of all templates
@@ -263 +263 @@
 template class std::list<int>;
 template class std::list<long>;
-template class std::list<poly>;
 template class std::list<MinorKey>;
 template class std::list<LongMinorValue>;

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.320 2009-10-02 16:13:30 seelisch Exp $ */
+/* $Id: extra.cc,v 1.321 2009-10-06 12:09:00 seelisch Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -2193 +2193 @@
 #endif // HAVE_MINOR
 /*==================== generic debug ==================================*/
-//#ifdef PDEBUG
+#ifdef PDEBUG
       if(strcmp(sys_cmd,"DetailedPrint")==0)
       {
@@ -2244 +2244 @@
       }
       else
-//#endif
+#endif
 /*==================== mtrack ==================================*/
     if(strcmp(sys_cmd,"mtrack")==0)