Changeset e44b149 in git for Singular

Timestamp:

Jul 3, 2013, 12:04:32 PM (11 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

f80a5305e1e0960855d4bd8702e48d1c2bbf8710

Parents:

a667138296109b29e11fe1654025d4581abfc50a

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-07-03 12:04:32+02:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2013-07-18 14:56:50+02:00

Message:

fix: missed assume for allowing empty bigintmats

File:

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

Singular/LIB/gitfan.lib

@@ -27 +27 @@
 
 LIB "parallel.lib"; // for parallelWaitAll
+LIB "general.lib";
 
 ////////////////////////////////////////////////////
-proc mod_init()
-{
-  LIB"gfanlib.so";
-}
-
-static proc int2face(int n, int r)
+
+proc int2face(int n, int r)
 {
   int k = r-1;
@@ -43 +40 @@
     while(2^k > n0){
       k--;
-      //v[size(v)+1] = 0;
     }
 
@@ -56 +52 @@
 /////////////////////////////////
 
-proc isAface(ideal a, intvec gam0)
+proc isAface(ideal a, intvec gam0, int n)
 "USAGE:  isAface(a,gam0); a: ideal, gam0:intvec
 PURPOSE: Checks whether the face of the positive orthant,
@@ -66 +62 @@
 "
 {
-  poly pz;
-
   // special case: gam0 is the zero-cone:
   if (size(gam0) == 1 and gam0[1] == 0){
-    ideal G;
+    poly pz; ideal G;
 
     // is an a-face if and only if RL0(0,...,0) = const
@@ -93 +87 @@
   }
 
-
-  // ring is too big: Switch to KK[T_i; e_i\in gam0] instead:
+  // ring is too big: Switch to KK[T_i | e_i\in gam0] instead:
+  intvec w=ringlist(basering)[3][1][2];
+  intvec w0;
   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)+");";
+  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
+  for ( i = 2; i <= nvars(basering); i++ ) {
+      p = p * var(i);
+    }
+  // p is now the product over all T_i, with e_i in gam0
+
+  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);
+  }
+
+  // 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
+}
+example
+{
+  echo = 2;
+
+  ring R = 0,(T(1..4)),dp;
+  ideal I = T(1)*T(2)-T(4);
+
+  intvec w = 1,4;
+  intvec v = 1,2,4;
+
+  isAface(I,w); // should be 0
+  "-----------";
+  isAface(I,v); // should be 1
+}
+
+
+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;
@@ -107 +184 @@
   ideal agam0 = imap(R,a);
 
-  poly p = var(1); // first entry of g; p = prod T_i with i element of g
-  for ( i = 2; i <= nvars(basering); i++ ) {
-      p = p * var(i);
-    }
-  // p is now the product over all T_i, with e_i in gam0
-
-  agam0 = agam0, p - 1; // rad-membership
+  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);
 
-  // does G contain 1?, i.e. is G = 1?
-  if(G <> 1) {
-    return(1); // true
-  }
-
-  return(0); // false
-}
-example
-{
-  echo = 2;
-
-  ring R = 0,(T(1..4)),dp;
-  ideal I = T(1)*T(2)-T(4);
-
-  intvec w = 1,4;
-  intvec v = 1,2,4;
-
-  isAface(I,w); // should be 0
-  "-----------";
-  isAface(I,v); // should be 1
-}
-
+  if(G <> 1)
+    { return(1); }
+
+  return(0);
+}
 ////////////////////////////////////////////////////
 
@@ -145 +206 @@
   list AF;
 
-  for(i = start; i <= end; i++){
+  for(i = start; i <= end; i=i+1){
     if(i < 2^r){
+      string(i)+"    "+string(size(AF));
       gam0 = int2face(i,r);
 
@@ -165 +227 @@
 
 proc afaces(ideal a, list #)
-"USAGE:  afaces(a, b, c); a: ideal, d: int, c: int
+"USAGE:  afaces(a, b, c); a: ideal, b: int, c: int
 PURPOSE: Returns a list of all a-faces (represented by intvecs).
          Moreover, it is possible to specify a dimensional bound b,
@@ -210 +272 @@
 
   // do remaining ones:
-  for(i = ncores * step +1; i < 2^r; i++){
+  for(i = ncores * step +1; i < 2^r; i=i+1){
     "another one needed";
     gam0 = int2face(i,r);
@@ -223 +285 @@
   }
 
+  int l;
   // read out afaces of out into AF:
-  for(i = 1; i <= size(out); i++){
-    AF = AF + out[i];
+  for(l = 1; l <= size(out); l++){
+    AF = AF + out[l];
   }