Changeset 7d60f7 in git

Timestamp:

Oct 29, 2009, 4:54:04 PM (14 years ago)

Author:

Martin Monerjan

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

61197ff3d42399e95c952f06a3cd10fdd665dd82

Parents:

f5d2963eec6952b42517b3865c98f0a7ddedae43

Message:

kNF and timings


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

File:

• kernel/gfan.cc (modified) (7 diffs)

kernel/gfan.cc

@@ -2 +2 @@
 Compute the Groebner fan of an ideal
 $Author: monerjan $
-$Date: 2009-10-23 14:56:55 $
-$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.100 2009-10-23 14:56:55 monerjan Exp $
-$Id: gfan.cc,v 1.100 2009-10-23 14:56:55 monerjan Exp $
+$Date: 2009-10-29 15:54:04 $
+$Header: /exports/cvsroot-2/cvsroot/kernel/gfan.cc,v 1.101 2009-10-29 15:54:04 monerjan Exp $
+$Id: gfan.cc,v 1.101 2009-10-29 15:54:04 monerjan Exp $
 */
 
@@ -27 +27 @@
 #include <string>
 #include <sstream>
+#include <time.h>
 //#include <gmpxx.h>
 
@@ -1051 +1052 @@
                         {
 #ifdef gfan_DEBUG
-                                                //cout << src_ExpV[kk] << "," << dst_ExpV[kk] << endl;
+                                                cout << src_ExpV[kk] << "," << dst_ExpV[kk] << endl;
 #endif
                                 if (src_ExpV[kk]!=dst_ExpV[kk])
@@ -1063 +1064 @@
                                 markingsAreCorrect=TRUE; //everything is fine
 #ifdef gfan_DEBUG
-//                                              cout << "correct markings" << endl;
+                                                cout << "correct markings" << endl;
 #endif
                         }//if (pHead(aktpoly)==pHead(H->m[jj])
@@ -1275 +1276 @@
         for (int ii=0;ii<size;ii++)
         {
-                res->m[ii]=restOfDiv(H->m[ii],G);
-                                //res->m[ii]=kNF(G, NULL,H->m[ii]);
+//              res->m[ii]=restOfDiv(H->m[ii],G);
+                res->m[ii]=kNF(G, NULL,H->m[ii],0,0);
                 temp1=H->m[ii];
                 temp2=res->m[ii];                               
@@ -2658 +2659 @@
 ideal gfan(ideal inputIdeal, int h)
 {
+        time_t tic,tac;
+        time(&tic);
+        
         int numvar = pVariables; 
         gfanHeuristic = h;
@@ -2752 +2756 @@
         //res=gcAct->gcBasis;
         //res=gcRoot->gcBasis;  
+        time(&tac);
+        cout << "Time: " << difftime(tac,tic) << "sec" << endl;
         return res;
         //return GBlist;