Changeset 747a1e in git for Singular/LIB

Timestamp:

May 28, 2010, 12:16:16 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4bd32dfef92ec9f5ed8dceee82d14318ae147107')

Children:

12cca3ff11b4a22801170a24e54b4b0fc1eda12d

Parents:

8017e90b3d8ba6d6c93419d574d5ec289a1d885a

Message:

optim.

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

File:

• Singular/LIB/random.lib (modified) (7 diffs)

Singular/LIB/random.lib

@@ -126 +126 @@
 //----------------------------- set defaults ----------------------------------
    if( size(#)>=3 ) { int o=#[1]; int p=#[2]; int b=#[3]; }
-   if( size(#)==2 ) { int o=#[1]; int p=#[2]; int b=30000; }
-   if( size(#)==1 ) { int o=#[1]; int p=75; int b=30000; }
-   if( size(#)==0 ) { int o=u; int p=75; int b=30000; }
+   else {if( size(#)==2 ) { int o=#[1]; int p=#[2]; int b=30000; }
+   else {if( size(#)==1 ) { int o=#[1]; int p=75; int b=30000; }
+   else {if( size(#)==0 ) { int o=u; int p=75; int b=30000; }}}}
 //------------------ use sparsemat for creation of sparseid -------------------
    int ii; matrix i[1][k]; intmat m;
@@ -137 +137 @@
       u=1;
    }
-   for ( ii=u; ii<=o; ii=ii+1)
+   for ( ii=u; ii<=o; ii++)
    {
        m = sparsemat(size(maxideal(ii)),k,p,b);
@@ -169 +169 @@
    int ii; ideal i; intmat m; ideal id;
 
-   for ( ii=k; ii>0; ii=ii-1)
+   for ( ii=k; ii>0; ii--)
    {
        id = maxideal(random(u, o)); // monomial basis of some degree
@@ -207 +207 @@
    if( p<40 )
    {
-      for( ii=1; ii<=t; ii=ii+1 )
+      for( ii=1; ii<=t; ii++ )
       { r=( random(1,100)>p ); v[1,ii]=r*random(1,b); h=h+r; }
    }
@@ -248 +248 @@
    int pe=50;int u=0;int pp=75;int b=100;
    if( size(#)==4 ) { u=#[1]; pe=#[2]; pp=#[3]; b=#[4]; }
-   if( size(#)==3 ) { u=#[1]; pe=#[2]; pp=#[3]; }
-   if( size(#)==2 ) { u=#[1]; pe=#[2]; }
-   if( size(#)==1 ) { u=#[1]; }
+   else { if( size(#)==3 ) { u=#[1]; pe=#[2]; pp=#[3]; }
+   else { if( size(#)==2 ) { u=#[1]; pe=#[2]; }
+   else {if( size(#)==1 ) { u=#[1]; }}}}
 //------------------- use sparsemat and sparseid  -----------------------------
    intmat I = sparsemat(n,m,pe,1);
-   for(ii=1; ii<=n;ii++)
+   for(ii=n; ii>0;ii--)
    {
      id = sparseid(m,u,o,pp,b);
-     for(jj=1; jj<=m; jj++)
+     for(jj=m; jj>0; jj--)
      {
         if( I[ii,jj] !=0)
@@ -286 +286 @@
 //----------------------------- set defaults ----------------------------------
    if( size(#)>=3 ) { int o=#[1]; int p=#[2]; int b=#[3]; }
-   if( size(#)==2 ) { int o=#[1]; int p=#[2]; int b=30000; }
-   if( size(#)==1 ) { int o=#[1]; int p=75; int b=30000; }
-   if( size(#)==0 ) { int o=u; int p=75; int b=30000; }
+   else {if( size(#)==2 ) { int o=#[1]; int p=#[2]; int b=30000; }
+   else {if( size(#)==1 ) { int o=#[1]; int p=75; int b=30000; }
+   else {if( size(#)==0 ) { int o=u; int p=75; int b=30000; }}}}
    int ii; poly f;
 //----------------- use sparseid for creation of sparsepoly -------------------
-   for( ii=u; ii<=o; ii=ii+1 ) { f=f+sparseid(1,ii,ii,p,b)[1]; }
+   for( ii=u; ii<=o; ii++ ) { f=f+sparseid(1,ii,ii,p,b)[1]; }
    return(f);
 }
@@ -320 +320 @@
    if( n<=m ) { min=n-1; M[n,n]=1; }
    else { min=m; }
-   for( ii=1; ii<=min; ii=ii+1 )
+   for( ii=1; ii<=min; ii++ )
    {
       l=r+1; r=r+n-ii;