Changeset 7de961 in git

Timestamp:

Jun 9, 2015, 4:07:18 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

8aa9770fc6e41a905d10dd6cac4556354095e462

Parents:

8fe1512a20298a7470ea0420e2d202969e2d40c3

Message:

code cleanup: Standard::groebner

Files:

• Singular/LIB/standard.lib (modified) (6 diffs)
• Tst/Manual/breakpoint.res.gz.uu (modified) (1 diff)

Singular/LIB/standard.lib

@@ -804 +804 @@
 "SYNTAX: @code{groebner (} ideal_expression @code{)} @*
          @code{groebner (} module_expression @code{)} @*
-         @code{groebner (} ideal_expression@code{,} int_expression @code{)} @*
-         @code{groebner (} module_expression@code{,} int_expression @code{)} @*
          @code{groebner (} ideal_expression@code{,} list of string_expressions
                @code{)} @*
          @code{groebner (} ideal_expression@code{,} list of string_expressions
-               and int_expression @code{)} @*
-         @code{groebner (} ideal_expression@code{,} int_expression @code{)}
+               and int_expression @code{)}
 TYPE:    type of the first argument
 PURPOSE: computes a standard basis of the first argument @code{I}
@@ -829 +826 @@
          afterwards back).
          @code{option(prot)} informs about the chosen method.
-NOTE:    If an additional argument, say @code{wait}, of type int is given,
-         then the computation runs for at most @code{wait} seconds.
-         That is, if no result could be computed in @code{wait} seconds,
-         then the computation is interrupted, 0 is returned, a warning
-         message is displayed, and the global variable
-         @code{Standard::groebner_error} is defined.
-         This feature uses MP and hence it is available on UNIX platforms, only.
 HINT:    Since there exists no uniform best method for computing standard
          bases, and since the difference in performance of a method on
@@ -843 +833 @@
          parameters/variables by integers, etc.). @*
 SEE ALSO: stdhilb, stdfglm, std, slimgb
-KEYWORDS: time limit on computations; MP, groebner basis computations
+KEYWORDS: groebner basis computations
 EXAMPLE: example groebner;  shows an example"
 
@@ -904 +894 @@
   for (k=1; k<=size(#); k++)
   {
-     if (typeof(#[k]) == "int")
-     {
-       int wait = #[k];
-     }
      if (typeof(#[k]) == "string")
      {
@@ -914 +900 @@
      }
   }
-
- //======= we have an argument of type int -- try to use MPfork links =======
-  if ( defined(wait) == voice )
-  {
-    if ( system("with", "MP") )
-    {
-        int j = 10;
-        string bs = nameof(basering);
-        link l_fork = "MPtcp:fork";
-        open(l_fork);
-        write(l_fork, quote(system("pid")));
-        int pid = read(l_fork);
-//        write(l_fork, quote(groebner(eval(i))));
-        write(l_fork, quote(groebner(eval(i),eval(Method))));
-//###Fehlermeldung:
-// ***dError: undef. ringorder used
-// occured at:
-
-        // sleep in small intervalls for appr. one second
-        if (wait > 0)
-        {
-          while(j < 1000000)
-          {
-            if (status(l_fork, "read", "ready", j)) {break;}
-            j = j + j;
-          }
-        }
-
-        // sleep in intervalls of one second from now on
-        j = 1;
-        while (j < wait)
-        {
-          if (status(l_fork, "read", "ready", 1000000)) {break;}
-          j = j + 1;
-        }
-
-        if (status(l_fork, "read", "ready"))
-        {
-          def result = read(l_fork);
-          if (bs != nameof(basering))
-          {
-            def PP = basering;
-            setring P;
-            def result = imap(PP, result);
-            kill PP;
-          }
-          if (defined(groebner_error)==1)
-          {
-            kill groebner_error;
-          }
-          kill l_fork;
-        }
-        else
-        {
-          ideal result;
-          if (! defined(groebner_error))
-          {
-            int groebner_error = 1;
-            export groebner_error;
-          }
-          "** groebner did not finish";
-          j = system("sh", "kill " + string(pid));
-        }
-        return (result);
-    }
-    else
-    {
-      "** groebner with a time limit on computation is not supported
-          in this configuration";
-    }
-  }
-
- //=========== we are still here -- do the actual computation =============
 
 //--------------------- save data from basering ---------------------------
@@ -1065 +978 @@
   if( find(method,"hilb") && !find(method,"fglm") )
   {
-     conversion = "hilb"; // $Id$
+     conversion = "hilb";
   }
   if( find(method,"fglm") && !find(method,"hilb") )
   {
-    conversion = "fglm"; // $Id$
+    conversion = "fglm";
   }
   if( find(method,"fglm") && find(method,"hilb") )
   {
-    conversion = "hilborfglm"; // $Id$
+    conversion = "hilborfglm";
   }
   if( !find(method,"fglm") && !find(method,"hilb") )
   {
-    conversion = "no"; // $Id$
+    conversion = "no";
   }
 

Tst/Manual/breakpoint.res.gz.uu

@@ -1 +1 @@
 begin 640 breakpoint.res.gz
-M'XL("(4YR5,``V)R96%K<&]I;G0N<F5S`'7000N"0!`%X+N_XB$=5C!),Q.$
-M/407(;K8/12'6)(UW(GZ^:U1IF"G7?;-^V"G..WS(X!0XI#OX++AH%&5F\'>
-MSDHK%E[F]">D1-51>;VU2G.@Z1$8+MDI/D(TCL6E:ZG2U-GR[Q6ACY+1*$U(
-MXQ1*XSLW,.M9QD>X3:96]+-L-FO%?ZQE.*',N(R:&F*JQ>J9>(.TD>]]]!^^
-.&V'K"^<%^NY1DCH!````
+M'XL("$+R=E4``V)R96%K<&]I;G0N<F5S`'7000N"0!`%X+N_XB$=5C!IM4P0
+M/$07(;K8/12'6)(UW(GZ^:U1IF"G7?;-^V"G..WS(P"9X9#OX++AH%&5F\+>
+MSDHK%E[J]">R#%5'Y?76*LV!ID=@N&2G^`CA.!:7KJ5*4V?+OU=('R6C49J0
+M1`F4QG=N8*)9QH?<QE,K_%DVF[76?ZREG%!F7$9-#3'58O6,O4':9.]]]!^^
+.&V'K"^<%/$@GQSH!````
 `
 end