Changeset 4820e6 in git

Timestamp:

Jan 15, 2009, 2:51:18 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5563ba8508b091b9f3b551d8c751bde89b4e7186

Parents:

684be2d3473879698c86436570f937e39ddb3c70

Message:

*hannes: optim


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

Location:

Singular/LIB

Files:

• elim.lib (modified) (11 diffs)
• standard.lib (modified) (7 diffs)

Singular/LIB/elim.lib

@@ -1 @@
-// $Id: elim.lib,v 1.27 2009-01-15 10:57:51 Singular Exp $
+// $Id: elim.lib,v 1.28 2009-01-15 13:51:18 Singular Exp $
 // (GMG, modified 22.06.96)
 // GMG, last modified 30.10.08: new procedure elimRing;
@@ -10 +10 @@
 // and can now choose as method slimgb or std.
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: elim.lib,v 1.27 2009-01-15 10:57:51 Singular Exp $";
+version="$Id: elim.lib,v 1.28 2009-01-15 13:51:18 Singular Exp $";
 category="Commutative Algebra";
 info="
@@ -99 +99 @@
 //--------------- create tr = K[x(1),...,x(n),t] ---------------------------
    int s = size(l[3]);
-   for ( i=1; i<=n; i++)
+   for ( i=n; i>=1; i--)
    {
       l[2][i]="x("+string(i)+")";
@@ -110 +110 @@
    l[2]=delete(l[2],n+1);
    l[3]=delete(l[3],s);
-   for ( i=1; i<=k; i++)
+   for ( i=k; i>=1; i--)
    {
       l[2][n+i]="y("+string(i)+")";
@@ -121 +121 @@
    if( homog(C) )
    {
-      for( i=1; i<=k; i++)
+      for( i=k; i>=1; i--)
       {
          v[i]=deg(C[i]);
@@ -136 +136 @@
    else
    {
-      for( i=1; i<=k; i++)
-      {
-         v[i]=1;
-      }
+      v=1:k;
       l[3][s]=list("dp",v);
    }
@@ -280 +277 @@
         w2 = w2,@w[ii];
         v2 = v2+list(string(var(ii)));
-        if ( defined(local) == 0 )
+        if ( ! defined(local) )
         {
            int local = (var(ii) < 1);
@@ -329 +326 @@
     if( w2==1 )              //weights for vars not to be eliminated are all 1
     {
-       if ( local==1 )
+       if ( local )
        {
           B3[2] = list("ds", w2);
@@ -340 +337 @@
     else
     {
-       if ( local==1 )
+       if ( local )
        {
           B3[2] = list("ws", w2);
@@ -357 +354 @@
     if( @w==1 )              //weights for all vars are 1
     {
-       if ( local==1 )
+       if ( local )
        {
           B3[2] = list("ls", @w);
@@ -368 +365 @@
     else
     {
-       if ( local==1 )
+       if ( local )
        {
           B3[2] = list("ws", @w);

Singular/LIB/standard.lib

@@ -5 +5 @@
 //### Todo: im lokalen Fall die Hilbert-Samuel Funktion verwenden
 //////////////////////////////////////////////////////////////////////////////
-version="$Id: standard.lib,v 1.105 2009-01-15 10:57:30 Singular Exp $";
+version="$Id: standard.lib,v 1.106 2009-01-15 13:51:18 Singular Exp $";
 category="Miscellaneous";
 info="
@@ -29 +29 @@
 //////////////////////////////////////////////////////////////////////////////
 
-proc stdfglm (i, list #)
+proc stdfglm (ideal i, list #)
 "SYNTAX: @code{stdfglm (} ideal_expression @code{)} @*
          @code{stdfglm (} ideal_expression@code{,} string_expression @code{)}
@@ -44 +44 @@
 EXAMPLE: example stdfglm; shows an example"
 {
-  if (typeof(i)!="ideal")
-  {
-    ERROR("first argument of 'stdfglm' must be an ideal");
-  }
   string os;
   int s = size(#);
@@ -67 +63 @@
   }
 
-  if( s > 0 && (typeof(#[1]) == "string") )
+  if((s > 0) && (typeof(#[1]) == "string"))
   {
     os = #[1];
@@ -229 +225 @@
   {
     intvec w;
-    for(k=1;  k<=nvarP; k++)
+    for(k=nvarP;  k>=1; k--)
     {
        w[k] = deg(var(k));     //compute ring weights
@@ -247 +243 @@
 //Note that quotient ideal of qring must be homogeneous too
 
-  int neg;
-  for ( k=1; k<=nvarP; k++)
-  {
-     if( var(k) < 1)
-     { neg = 1; }
-  }
-
-  if( find(ordstr_P,"s") || find(ordstr_P,"M") || (neg > 0) )
+  int neg=1-attrib (P,"global");
+
+  if( //find(ordstr_P,"s") ||// covered by neg
+     find(ordstr_P,"M") || neg )
   {
     // if( defined(hi) && is_homog )
@@ -1035 +1027 @@
 
   if(  //( find(ordstr_P,"s") > 0 ) || // covered by neg
-       ( find(ordstr_P,"M") > 0 )  || ( find(ordstr_P,"a") > 0 )  || ( neg>0 ) )
+       ( find(ordstr_P,"M") > 0 )  || ( find(ordstr_P,"a") > 0 )  || neg )
   {
     if (p_opt) { "std in basering"; }