Changeset bf5ba90 in git

Timestamp:

Nov 18, 2006, 1:57:31 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

c8f1b47b962db811a4dfaab3b802c18cfe20bc5e

Parents:

ca3e7b5e9ae94d45a0eebab22cb38d16c7542b01

Message:

*hannes: optimization


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

File:

• Singular/LIB/matrix.lib (modified) (14 diffs)

Singular/LIB/matrix.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: matrix.lib,v 1.33 2006-11-17 14:15:42 Singular Exp $";
+version="$Id: matrix.lib,v 1.34 2006-11-18 12:57:31 Singular Exp $";
 category="Linear Algebra";
 info="
@@ -59 +59 @@
       { intmat B[nrows(A)][size(m)]; }
       int i,j;
-      for( i=1; i<=ncols(A); i=i+1 )
+      for( i=1; i<=ncols(A); i++ )
       {
          if( m[i]!=[0] )
          {
-            j=j+1;
+            j++;
             B[1..nrows(A),j]=A[1..nrows(A),i];
          }
@@ -94 +94 @@
 {
    int i;
-   module B=module(#[1]);
-   for( i=2; i<=size(#); i++ ) { B=B,module(#[i]); }
+   for( i=size(#);i>0; i-- ) { #[i]=module(#[i]); }
+   module B=#[1..size(#)];
    return(matrix(B));
 }
@@ -124 +124 @@
       int i; ideal id=#[1];
       int n=ncols(id); matrix A[n][n];
-      for( i=1; i<=n; i=i+1 ) { A[i,i]=id[i]; }
+      for( i=1; i<=n; i++ ) { A[i,i]=id[i]; }
    }
    return(A);
@@ -146 +146 @@
    int i,N,a;
    list L;
-   for( i=1; i<=size(#); i=i+1 ) { N=N+nrows(#[i]); }
-   for( i=1; i<=size(#); i=i+1 )
+   for( i=1; i<=size(#); i++ ) { N=N+nrows(#[i]); }
+   for( i=1; i<=size(#); i++ )
    {
       matrix B[N][ncols(#[i])];
@@ -223 +223 @@
    int i;
    module @test;
-   for( i=1; i<=size(c)-1; i=i+1 )
+   for( i=1; i<=size(c)-1; i++ )
    {
       c[i]=matrix(c[i]); c[i+1]=matrix(c[i+1]);
@@ -262 +262 @@
      int N = nrows(A)*nrows(B);
      matrix C[N][ncols(B)];
-     for( i=1; i<=ncols(A); i=i+1 )
+     for( i=1; i<=ncols(A); i++ )
      {
-       for( j=1; j<=nrows(A); j=j+1 )
+       for( j=1; j<=nrows(A); j++ )
        {
           C[(j-1)*nrows(B)+1..j*nrows(B),1..ncols(B)]=A[j,i]*B;
@@ -373 +373 @@
    id = id,B[1..n,1..n];
    int i,j;
-   for( i=0; i<=n-2; i=i+1 )
+   for( i=0; i<=n-2; i++ )
    {
       B[i+1,i+2..n]=id[j+1..j+n-i-1];
@@ -430 +430 @@
    id = id,B[1..n,1..n];
    int i,j;
-   for( i=0; i<=n-1; i=i+1 )
+   for( i=0; i<=n-1; i++ )
    {
       B[i+1,i+1..n]=id[j+1..j+n-i];
@@ -436 +436 @@
    }
    matrix A=transpose(B);
-   for( i=1; i<=n; i=i+1 ) {  A[i,i]=0; }
+   for( i=1; i<=n; i++ ) {  A[i,i]=0; }
    B=A+B;
    return(B);
@@ -787 +787 @@
    poly p;
    matrix d[m][n];
-   for (i=1;i<=m;i=i+1)
-   {  for (j=1;j<=n;j=j+1)
+   for (i=1;i<=m;i++)
+   {  for (j=1;j<=n;j++)
       {  p = A[i,j];
          if (ord(p)==0)
@@ -805 +805 @@
          p  = b[rk,l];         p = 1/p;
          b  = multrow(b,rk,p);
-         for (i=1;i<=m;i=i+1)
+         for (i=1;i<=m;i++)
          {
             if (rk-i) { b = addrow(b,rk,-b[i,l],i);}
          }
          d = 0;
-         for (i=rk+1;i<=m;i=i+1)
-         {  for (j=l+1;j<=n;j=j+1)
+         for (i=rk+1;i<=m;i++)
+         {  for (j=l+1;j<=n;j++)
             {  p = b[i,j];
                if (ord(p)==0)
@@ -911 +911 @@
  int l,j;
  intvec v;
- for (j=1;j<=ncols(A);j=j+1)
+ for (j=1;j<=ncols(A);j++)
  {
     if (gen(l+1)==module(A)[j]) {l=l+1;}
@@ -947 +947 @@
  intvec v;
  module M = transpose(A);
- for (j=1; j <= nrows(A); j=j+1)
+ for (j=1; j <= nrows(A); j++)
  {
     if (gen(l+1) == M[j]) { l=l+1; }