Changeset 87977c7 in git for Singular

Timestamp:

Jul 25, 2013, 12:47:23 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2ea18609e14482a4ddbe0fd0d68b8d5885268a0c

Parents:

c3066da943ed65e5390f6c04d9a69f7710bfc83547e8b0441e7692a4a4b6c2f23817976fe5203f1c

Message:

Merge pull request #342 from YueRen/spielwiese

Spielwiese

Location:

Singular

Files:

• LIB/classify_aeq.lib (modified) (3 diffs)
• LIB/classifyci.lib (added)
• LIB/gitfan.lib (modified) (10 diffs)
• fehelp.cc (modified) (11 diffs)
• misc_ip.cc (modified) (2 diffs)
• pcv.cc (modified) (3 diffs)
• pyobject.cc (modified) (3 diffs)
• singular-libs (modified) (1 diff)

Singular/LIB/classify_aeq.lib

@@ -668 +668 @@
 {
     def R=basering;
-    def O=changeord("Ds");
+    def O=changeord(list(list("Ds",nvars(R))));
     setring O;
     ideal I=imap(R,I);
@@ -717 +717 @@
 {
   def R=basering;//up till now the ordering of the base ring is ds
-  def O=changeord("Ds");
+  def O=changeord(list(list("Ds",nvars(R))));
   setring O;
   ideal I=imap(R,I);
@@ -1377 +1377 @@
 ideal I=4t3,7t6+10t9;
 ideal G=t4,t7+t10;
-sagbiMOD(I,G,18);
+sagbiMod(I,G,18);
 */
 

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];
   }
 

Singular/fehelp.cc

@@ -99 +99 @@
  *
  *****************************************************************/
-// order is improtant -- first possible help is choosen
+// order is important -- first possible help is chosen
 // moved to LIB/help.cnf
 static heBrowser_s *heHelpBrowsers=NULL;
@@ -117 +117 @@
 
   BOOLEAN key_is_regexp = (strchr(str, '*') != NULL);
+
+  // try proc help and library help
+  if (! key_is_regexp && heOnlineHelp(str)) return;
+
   heEntry_s hentry;
   memset(&hentry,0,sizeof(hentry));
@@ -127 +131 @@
     return;
   }
-
-  // try proc help and library help
-  if (! key_is_regexp && heOnlineHelp(str)) return;
 
   // Try to match approximately with key in index file
@@ -191 +192 @@
     char *matches=StringEndS();
     PrintS(matches);
+    omFree(matches);
     PrintLn();
-    omFree(matches);
     return;
   }
@@ -687 +688 @@
 static BOOLEAN heOnlineHelp(char* s)
 {
-  idhdl h=IDROOT->get(s,myynest);
   char *ss;
-
+  idhdl h;
+
+  if ((ss=strstr(s,"::"))!=NULL)
+  {
+    *ss='\0';
+    ss+=2;
+    h=ggetid(s);
+    if (h!=NULL)
+    {
+      Print("help for %s from package %s\n",ss,s);
+      char s_help[200];
+      strcpy(s_help,ss);
+      strcat(s_help,"_help");
+      idhdl hh=IDPACKAGE(h)->idroot->get(s_help,0);
+      hePrintHelpStr(hh,s_help,s);
+      return TRUE;
+    }
+    else Print("package %s not found\n",s);
+    return TRUE; /* do not search the manual */
+  }
+  h=IDROOT->get(s,myynest);
   // try help for a procedure
   if (h!=NULL)
@@ -707 +727 @@
         return TRUE;
       }
-      else
-      {
-        char s_help[200];
-        strcpy(s_help,s);
-        strcat(s_help,"_help");
-        idhdl hh=IDROOT->get(s_help,0);
-        hePrintHelpStr(hh,s_help,"Top");
-      }
     }
     else if (IDTYP(h)==PACKAGE_CMD)
@@ -720 +732 @@
       idhdl hh=IDPACKAGE(h)->idroot->get("info",0);
       hePrintHelpStr(hh,"info",s);
-    }
-    else if ((ss=strstr(s,"::"))!=NULL)
-    {
-      *ss='\0';
-      ss+=2;
-      h=ggetid(s);
-      if (h!=NULL)
-      {
-        Print("help for %s from package %s\n",ss,s);
-        char s_help[200];
-        strcpy(s_help,ss);
-        strcat(s_help,"_help");
-        idhdl hh=IDPACKAGE(h)->idroot->get(s_help,0);
-        hePrintHelpStr(hh,s_help,s);
-      }
-      else Print("package %s not found\n",s);
+      return TRUE;
     }
     return FALSE;
@@ -892 +889 @@
                if (feResource(*p, warn) == NULL)
                {
-                 if (warn) Warn("ressource `%c` not found",*p);
+                 if (warn) Warn("resource `%c` not found",*p);
                  return FALSE;
                }
@@ -899 +896 @@
                if (getenv("DISPLAY") == NULL)
                {
-                 if (warn) WarnS("ressource `D` not found");
+                 if (warn) WarnS("resource `D` not found");
                  return FALSE;
                }
@@ -984 +981 @@
 {
   char sys[MAX_SYSCMD_LEN];
-  // char url[MAXPATHLEN];
   const char *p=heHelpBrowsers[br].action;
   if (p==NULL) {PrintS("no action ?\n"); return;}
@@ -1067 +1063 @@
   }
   Print("running `%s`\n",sys);
-  /*int dummy=*/ (void) system(sys);
+  (void) system(sys);
 }
 

Singular/misc_ip.cc

@@ -49 +49 @@
     && (mpz_cmp_si(n,(long)ui)==0))
     {
-      L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)ui;
+      L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)(long)ui;
       return;
     }
@@ -63 +63 @@
   if ((((unsigned long)i)==ui) && (((i<<3)>>3)==i))
   {
-    L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)i;
+    L->m[index].rtyp = INT_CMD; L->m[index].data = (void*)(long)i;
   }
   else

Singular/pcv.cc

@@ -149 +149 @@
     {
       res->rtyp=INT_CMD;
-      res->data=(void*)pcvMinDeg((poly)h->Data());
+      res->data=(void*)(long)pcvMinDeg((poly)h->Data());
       return FALSE;
     }
@@ -156 +156 @@
     {
       res->rtyp=INT_CMD;
-      res->data=(void*)pcvMinDeg((matrix)h->Data());
+      res->data=(void*)(long)pcvMinDeg((matrix)h->Data());
       return FALSE;
     }
@@ -400 +400 @@
         int d1=(int)(long)h->Data();
         res->rtyp=INT_CMD;
-        res->data=(void*)pcvDim(d0,d1);
+        res->data=(void*)(long)pcvDim(d0,d1);
         return FALSE;
       }

Singular/pyobject.cc

@@ -101 +101 @@
   {
     // Sone python modules needs argc, argv set for some reason
-    char* argv = "";
+    char* argv = (char*)"";
     PySys_SetArgv(1, &argv);
     PyRun_SimpleString("from sys import path, modules");
@@ -256 +256 @@
     PyErr_Fetch(&pType, &pMessage, &pTraceback);
     
-    Werror("pyobject error occured");
-    Werror(PyString_AsString(pMessage));
+    WerrorS("pyobject error occured");
+    WerrorS(PyString_AsString(pMessage));
     
     Py_XDECREF(pType);
@@ -580 +580 @@
     case '<': case '>': case EQUAL_EQUAL: case NOTEQUAL: case GE: case LE:
     {
-      res->data = (void *)lhs.compare(op, PythonCastDynamic(arg2));
+      res->data = (void *)(long)(lhs.compare(op, PythonCastDynamic(arg2)));
       res->rtyp = INT_CMD;
       return FALSE;

Singular/singular-libs

@@ -41 +41 @@
 # for new libs
 
-SLIB1 = ffsolve.lib decomp.lib template.lib findifs.lib finitediff.lib locnormal.lib modnormal.lib \
+SLIB1 = classifyci.lib classify_aeq.lib ffsolve.lib decomp.lib template.lib\
+        findifs.lib finitediff.lib \
+        locnormal.lib modnormal.lib \
         JMBTest.lib JMSConst.lib multigrading.lib parallel.lib realizationMatroids.lib ringgb.lib \
         schreyer.lib symodstd.lib derham.lib polybori.lib