Changeset 1134b5 in git

Timestamp:

Apr 19, 2007, 2:52:17 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

bb9a5a2a1df0eacab065576595d4d0635e0ecae1

Parents:

fccc2cf5940d8517759ffec19729c2a215514510

Message:

*hannes: i++, i--, substitute


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

File:

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

Singular/LIB/poly.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: poly.lib,v 1.41 2007-01-23 15:03:37 Singular Exp $";
+version="$Id: poly.lib,v 1.42 2007-04-19 12:52:17 Singular Exp $";
 category="General purpose";
 info="
@@ -104 +104 @@
 @*       - case 2: ring variables in v substituted by polynomials in f:
            v[i] is substituted by f[i], i=1,...,i=min(size(v),ncols(f))
-NOTE:    this procedure extends the built-in command subst which substitutes
-         ring variables only by monomials
+NOTE:    this procedure extends the built-in command subst via maps
 EXAMPLE: example substitute; shows an example
 "
-
-{
-   def bas = basering;
-   ideal m = maxideal(1);
-   int i,ii;
-   if(typeof(#[1])=="poly")
-   {
-     poly v = #[1];
-     poly f = #[2];
-     map phi = bas,m;
-     def J = I;
-     for (ii=1; ii<=size(#) - 1; ii=ii+2)
-     {
-        m = maxideal(1);
-        i=rvar(#[ii]);
-        m[i] = #[ii+1];
-        phi = bas,m;
-        J = phi(J);
-     }
-     return(J);
-   }
-   if(typeof(#[1])=="ideal")
-   {
-     ideal v = #[1];
-     ideal f = #[2];
-     int mi = size(v);
-     if(ncols(f)<mi)
-     {
-        mi = ncols(f);
-     }
-     m[rvar(v[1])]=f[1];
-     map phi = bas,m;
-     def J = phi(I);
-     for (ii=2; ii<=mi; ii++)
-     {
-        m = maxideal(1);
-        m[rvar(v[ii])]=f[ii];
-        phi = bas,m;
-        J = phi(J);
-     }
-     return(J);
-   }
+{
+  def bas = basering;
+  ideal m = maxideal(1);
+  int i,ii;
+  if(typeof(#[1])=="poly")
+  {
+    poly v = #[1];
+    poly f = #[2];
+    map phi = bas,m;
+    def J = I;
+    for (ii=1; ii<=size(#) - 1; ii=ii+2)
+    {
+      m = maxideal(1);
+      i=rvar(#[ii]);
+      m[i] = #[ii+1];
+      phi = bas,m;
+      J = phi(J);
+    }
+    return(J);
+  }
+  if(typeof(#[1])=="ideal")
+  {
+    ideal v = #[1];
+    ideal f = #[2];
+    int mi = size(v);
+    if(ncols(f)<mi)
+    {
+      mi = ncols(f);
+    }
+    m[rvar(v[1])]=f[1];
+    map phi = bas,m;
+    def J = phi(I);
+    for (ii=2; ii<=mi; ii++)
+    {
+      m = maxideal(1);
+      m[rvar(v[ii])]=f[ii];
+      phi = bas,m;
+      J = phi(J);
+    }
+    return(J);
+  }
 }
 example
@@ -172 +170 @@
    int i,j;
    ideal s; poly t;
-   for ( j=0; j<=n-2; j=j+1 )
+   for ( j=0; j<=n-2; j++ )
    {
       t=0;
-      for( i=1;i<=n;i=i+1 ) { t=t+product(m,i..i+j); }
+      for( i=1;i<=n;i++ ) { t=t+product(m,i..i+j); }
       s=s+t;
    }
@@ -310 +308 @@
   int d=dim(std(#[1]));
   int a = ( d==-1 );
-  if( size(#) >1 ) { list L=a,d; return(L); }
+  if( size(#) >1 ) { return(list(a,d)); }
   return(a);
 }
@@ -336 +334 @@
    i = simplify(i,6);            // delete 0's and keep first of equal elements
    poly m = var(1); matrix C;
-   for (ii=2;ii<=nvars(basering);ii=ii+1) { m = m*var(ii); }
-   for (ii=1; ii<=size(i); ii=ii+1)
+   for (ii=2;ii<=nvars(basering);ii++) { m = m*var(ii); }
+   for (ii=1; ii<=size(i); ii++)
    {
       C = coef(i[ii],m);
-      for (jj=1; jj<=ncols(C); jj=jj+1)
+      for (jj=1; jj<=ncols(C); jj++)
       {
          t = string(C[2,jj]);  s = size(t);
@@ -397 +395 @@
    int r,c = nrows(M), ncols(M); int i,j;
    intmat m[r][c];
-   for (i=r; i>0; i=i-1)
-   {
-      for (j=c; j>0; j=j-1) { m[i,j] = findmaxdeg(M[i,j]); }
+   for (i=r; i>0; i--)
+   {
+      for (j=c; j>0; j--) { m[i,j] = findmaxdeg(M[i,j]); }
    }
    if (typeof(id)=="poly") { return(m[1,1]); }
@@ -466 +464 @@
    {
       int m = maxdeg(M[c]);
-      for (i=c-1; i>0; i=i-1)
+      for (i=c-1; i>0; i--)
       {
           n = maxdeg(M[i]);
@@ -533 +531 @@
    int r,c = nrows(M), ncols(M); int i,j;
    intmat m[r][c];
-   for (i=r; i>0; i=i-1)
-   {
-      for (j=c; j>0; j=j-1) { m[i,j] = findmindeg(M[i,j]); }
+   for (i=r; i>0; i--)
+   {
+      for (j=c; j>0; j--) { m[i,j] = findmindeg(M[i,j]); }
    }
    if (typeof(id)=="poly") { return(m[1,1]); }
@@ -602 +600 @@
    {
       int m = mindeg(M[c]);
-      for (i=c-1; i>0; i=i-1)
+      for (i=c-1; i>0; i--)
       {
           n = mindeg(M[i]);
@@ -612 +610 @@
       intvec v=#[1];                          //weight vector for the variables
       int m = findmindeg(M[c],v);
-      for (i=c-1; i>0; i=i-1)
+      for (i=c-1; i>0; i--)
       {
          n = findmindeg(M[i],v);