Changeset 6fa72f7 in git

Timestamp:

Jun 12, 1998, 11:33:33 AM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

0bf0ad404be0052347f95a8372099f264df3172a

Parents:

1d7c4b47b26fed52a770d79387350be523837831

Message:

* groebner: one parameter is like no parameter


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

File:

• Singular/LIB/standard.lib (modified) (6 diffs)

Singular/LIB/standard.lib

@@ -1 @@
-// $Id: standard.lib,v 1.18 1998-06-03 10:04:26 obachman Exp $
+// $Id: standard.lib,v 1.19 1998-06-12 09:33:33 obachman Exp $
 //////////////////////////////////////////////////////////////////////////////
 
-version="$Id: standard.lib,v 1.18 1998-06-03 10:04:26 obachman Exp $";
+version="$Id: standard.lib,v 1.19 1998-06-12 09:33:33 obachman Exp $";
 info="
 LIBRARY: standard.lib   PROCEDURES WHICH ARE ALWAYS LOADED AT START-UP
@@ -215 +215 @@
     else
     {
-      "// ** groebner with two args not supported in this configuration";
+      "// ** groebner with two args is not supported in this configuration";
     }
   }
@@ -238 +238 @@
 
   // return std if no parameters and (dp or wp)
-  if ((npars_P == 0) && IsSimple_P)
+  if ((npars_P <= 1) && IsSimple_P)
   {
     if (find(ordstr_P, "d") > 0)
@@ -269 +269 @@
   string varstr_P = varstr(P);
   string parstr_P = parstr(P);
-  int is_homog = (homog(i) && (npars_P == 0));
-
-  string ri = "ring Phelp =" + string(char(P)) + ",(" + varstr_P;
-  // parameters are converted to ring variables
-  if (npars_P > 0)
-  {
-    ri = ri + "," + parstr_P;
-  }
+  int is_homog = (homog(i) && (npars_P <= 1));
+  int add_vars = 0;
+  string ri = "ring Phelp =";
+  
+  // more than one parameters are converted to ring variables
+  if (npars_P > 1)
+  {
+    ri = ri + string(char(P)) + ",(" + varstr_P + "," + parstr_P;
+    add_vars = npars_P;
+  }
+  else
+  {
+    ri = ri + "(" + charstr(P) + "),(" + varstr_P;
+  }
+
   // a homogenizing variable is added, if necessary
   if (! is_homog)
   {
     ri = ri + ",@t";
+    add_vars = add_vars + 1;
   }
   // ordering is set to (dp, C)
@@ -307 +315 @@
   intvec hi=hilb(qh1,1);
 
-  if (is_homog && (npars_P == 0))
+  if (add_vars == 0)
   {
     // no additional variables were introduced
@@ -322 +330 @@
     // additional variables were introduced
     // need another intermediate ring
-    ri = "ring Phelp1 =" + string(char(P))
-      + ",(" + varstr(Phelp) + "),(" + ordstr_P;
-
-    // for lp without parameters, we do not need a block ordering
-    if ( ! (IsSimple_P && (npars_P + is_homog < 2) && find(ordstr_P, "l")))
+    ri = "ring Phelp1 = (" + charstr(Phelp) 
+      + "),(" + varstr(Phelp) + "),(" + ordstr_P;
+
+    // for lp wit at most one parameter, we do not need a block ordering
+    if ( ! (IsSimple_P && (add_vars <2) && find(ordstr_P, "l")))
     {
       // need block ordering
-      ri = ri + ", dp(" + string(npars_P + is_homog) + ")";
+      ri = ri + ", dp(" + string(add_vars) + ")";
     }
     ri = ri + ");";