Changeset 39ac9b in git

Timestamp:

Dec 18, 2013, 11:27:24 AM (9 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

74c446222122656dc7859919b51f3806768e7fd3

Parents:

744d97d5e92e1748aaf0b260cbdf6664488b8100

Message:

fix: unwanted changes in gitfan.lib

some changes in gitfan.lib were commited that were performance hacks
for computing the specific example of the GIT-Fan of M06
this gitfan.lib corresponds to the version in commit
  380a17b65f64c61a20280cc21d4db54c3412f165
with the minor change
-version="version gitfan.lib 4.0.0.0 Jun_2013 ";
+version="version gitfan.lib 4.0.0.0 Jun_2013 "; // $Id$
which was done in commit
  36869371ac9c1b61f069fc927adc41fbef647bc4

File:

• Singular/LIB/gitfan.lib (modified) (12 diffs)

Singular/LIB/gitfan.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////
-version="version gitfan.lib 4.0.0.0 Jun_2013 "; // $Id$
+version="version gitfan.lib 4.0.0.0 Jun_2013 ";  // $Id$
 category="Algebraic Geometry";
 info="
@@ -27 +27 @@
 
 LIB "parallel.lib"; // for parallelWaitAll
-LIB "general.lib";
 
 ////////////////////////////////////////////////////
-
-proc int2face(int n, int r)
+proc mod_init()
+{
+  LIB"gfanlib.so";
+}
+
+static proc int2face(int n, int r)
 {
   int k = r-1;
@@ -40 +43 @@
     while(2^k > n0){
       k--;
+      //v[size(v)+1] = 0;
     }
 
@@ -52 +56 @@
 /////////////////////////////////
 
-proc isAface(ideal a, intvec gam0, int n)
+proc isAface(ideal a, intvec gam0)
 "USAGE:  isAface(a,gam0); a: ideal, gam0:intvec
 PURPOSE: Checks whether the face of the positive orthant,
@@ -62 +66 @@
 "
 {
+  poly pz;
+
   // special case: gam0 is the zero-cone:
   if (size(gam0) == 1 and gam0[1] == 0){
-    poly pz; ideal G;
+    ideal G;
 
     // is an a-face if and only if RL0(0,...,0) = const
@@ -87 +93 @@
   }
 
-  // ring is too big: Switch to KK[T_i | e_i\in gam0] instead:
-  intvec w=ringlist(basering)[3][1][2];
-  intvec w0;
+
+  // ring is too big: Switch to KK[T_i; e_i\in gam0] instead:
   string initNewRing = "ring Rgam0 = 0,(";
 
   for (int i=1; i<size(gam0); i++){
     initNewRing = initNewRing + string(var(gam0[i])) + ",";
-    w0[i]=w[gam0[i]];
-  }
-
-  w0 = w0,w[gam0[i]],1;
-  initNewRing = initNewRing + string(var(gam0[size(gam0)])) + ",U),Wp("+string(w0)+");";
+  }
+
+  initNewRing = initNewRing + string(var(gam0[size(gam0)])) + "),dp;";
   def R = basering;
   execute(initNewRing);
 
   ideal agam0 = imap(R,a);
-
-  for (i = 1; i<=size(agam0); i=i+1)
-  {
-    if (size(agam0[i]) == 1)
-    { return(0,0); }
-  }
 
   poly p = var(1); // first entry of g; p = prod T_i with i element of g
@@ -117 +114 @@
 
   agam0 = agam0, p - 1; // rad-membership
-  agam0 = timeStd(agam0,5);
-  // "timestd finished after: "+string(timer-t);
-  // int timeout = 0;
-  if (attrib(agam0,"isSB") < 1)
-  {
-    kill agam0; kill Rgam0; kill initNewRing; kill w; kill w0; setring R; kill R;
-    return(0,1);
-    // // "timestd failed in "+string(gam0)+", falling back to saturation!";
-    // setring R; kill Rgam0;
-
-    // initNewRing = "ring Rgam0 = 0,(";
-
-    // w0 = 0;
-    // for (i=1; i<size(gam0); i++){
-    //   initNewRing = initNewRing + string(var(gam0[i])) + ",";
-    //   w0[i]=w[gam0[i]];
-    // }
-
-    // w0 = w0,w[gam0[i]];
-    // initNewRing = initNewRing + string(var(gam0[size(gam0)])) + "),Wp("+string(w0)+");";
-    // execute(initNewRing);
-
-    // ideal G = imap(R,a);
-
-    // timeout = 1;
-    // int t=rtimer;
-    // for(int k=nvars(basering); k>0; k--) { G=sat(G,var(k))[1]; }
-    // t = (rtimer - t) div 1000;
-    // string(n)+": saturation successful after "+string(t)+" with: "+string(G<>1);
-  }
+  ideal G = std(agam0);
 
   // does G contain 1?, i.e. is G = 1?
-  if(agam0 <> 1) {
-    kill agam0; kill Rgam0; kill initNewRing; kill w; kill w0; setring R; kill R;
-    return(1,0); // true
-  }
-
-  kill agam0; kill Rgam0; kill initNewRing; kill w; kill w0; setring R; kill R;
-  return(0,0); // false
+  if(G <> 1) {
+    return(1); // true
+  }
+
+  return(0); // false
 }
 example
@@ -172 +138 @@
 }
 
-
-proc isAfaceNonZero(ideal a, intvec gam0)
-{
-  string initNewRing = "ring Rgam0 = 0,(";
-  for (int i=1; i<size(gam0); i++)
-    { initNewRing = initNewRing + string(var(gam0[i])) + ","; }
-  initNewRing = initNewRing + string(var(gam0[size(gam0)])) + "),dp;";
-  def R = basering;
-  execute(initNewRing);
-
-  ideal agam0 = imap(R,a);
-
-  for ( i = 1; i<=size(agam0); i=i+1)
-    { if (size(agam0[i]) == 1) { return(0); } }
-
-  poly p = var(1);
-  for ( i = 2; i <= nvars(basering); i++ )
-    { p = p * var(i); }
-
-  agam0 = agam0, p - 1;
-  ideal G = std(agam0);
-
-  if(G <> 1)
-    { return(1); }
-
-  return(0);
-}
 ////////////////////////////////////////////////////
 
@@ -206 +145 @@
   list AF;
 
-  for(i = start; i <= end; i=i+1){
+  for(i = start; i <= end; i++){
     if(i < 2^r){
-      string(i)+"    "+string(size(AF));
       gam0 = int2face(i,r);
 
@@ -227 +165 @@
 
 proc afaces(ideal a, list #)
-"USAGE:  afaces(a, b, c); a: ideal, b: int, c: int
+"USAGE:  afaces(a, b, c); a: ideal, d: int, c: int
 PURPOSE: Returns a list of all a-faces (represented by intvecs).
          Moreover, it is possible to specify a dimensional bound b,
@@ -272 +210 @@
 
   // do remaining ones:
-  for(i = ncores * step +1; i < 2^r; i=i+1){
+  for(i = ncores * step +1; i < 2^r; i++){
     "another one needed";
     gam0 = int2face(i,r);
@@ -285 +223 @@
   }
 
-  int l;
   // read out afaces of out into AF:
-  for(l = 1; l <= size(out); l++){
-    AF = AF + out[l];
+  for(i = 1; i <= size(out); i++){
+    AF = AF + out[i];
   }