Changeset d675c7 in git

Timestamp:

Jul 8, 1996, 10:18:49 AM (27 years ago)

Author:

Rüdiger Stobbe <stobbe@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

f63dbca24fdad0fc65e8496a781d6830dafded8e

Parents:

cc3e5eb035f7602ac7563d30a082c4b4bc9debf6

Message:

"IteratedFor now handles the cases in which the mainvariable is not of
level 1.
"


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

Location:

factory

Files:

• fac_iterfor.cc (modified) (6 diffs)
• fac_iterfor.h (modified) (4 diffs)

factory/fac_iterfor.cc

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_iterfor.cc,v 1.0 1996-05-17 10:59:45 stobbe Exp $
+// $Id: fac_iterfor.cc,v 1.1 1996-07-08 08:18:49 stobbe Exp $
 
 /*
 $Log: not supported by cvs2svn $
+Revision 1.0  1996/05/17 10:59:45  stobbe
+Initial revision
+
 */
 
@@ -21 +24 @@
 }
 
-IteratedFor::IteratedFor( int n, int max ) : MAX( max ), N( n ), last( false )
+IteratedFor::IteratedFor( int from, int to, int max ) : MAX( max ), FROM( from ), TO( to ), N( TO-FROM ), last( false )
 {
-    ASSERT( n > 1 && max >= 0, "illegal iterated for" );
-    index = new int[n+1];
-    imax = new int[n+1];
-    fill( 2, max );
+    ASSERT( n >= 0 && max >= 0, "illegal iterated for" );
+    index = new int[N+1];
+    imax = new int[N+1];
+    fill( 0, max );
 }
 
-IteratedFor::IteratedFor( const IteratedFor & I ) : MAX( I.MAX ), N( I.N ), last( I.last )
+IteratedFor::IteratedFor( const IteratedFor & I ) : MAX( I.MAX ), FROM( I.FROM ), TO( I.TO ), N( I.N ), last( I.last )
 {
     index = new int[N+1];
     imax = new int[N+1];
-    for ( int i = 2; i<= N; i++ ) {
+    for ( int i = 0; i <= N; i++ ) {
         index[i] = I.index[i];
         imax[i] = I.imax[i];
@@ -56 +59 @@
             imax = new int[N+1];
         }
+        FROM = I.FROM;
+        TO = I.TO;
         MAX = I.MAX;
         last = I.last;
-        for ( int i = 2; i<= N; i++ ) {
+        for ( int i = 0; i<= N; i++ ) {
             index[i] = I.index[i];
             imax[i] = I.imax[i];
@@ -70 +75 @@
 {
     ASSERT( ! last, "no more iterations" );
-    if ( index[2] == MAX )
+    if ( index[0] == MAX )
         last = true;
     else {
@@ -79 +84 @@
         else {
             int i = N-1, m = index[N];
-            while ( i > 1 && index[i] == imax[i] ) {
+            while ( i > 0 && index[i] == imax[i] ) {
                 m += imax[i];
                 i--;
@@ -92 +97 @@
 IteratedFor::operator[] ( int i ) const
 {
-    ASSERT( i >= 2 && i <= N, "illegal index" );
-    return index[i];
+    ASSERT( i >= FROM && i <= TO, "illegal index" );
+    return index[i-FROM];
 }
 
 ostream& operator<< ( ostream& os, const IteratedFor & I )
 {
-    os << "( " << I[2];
-    for ( int i = 3; i <= I.n(); i++ )
+    os << "( " << I[I.from()];
+    for ( int i = I.from()+1; i <= I.to(); i++ )
         os << ", " << I[i];
     os << " )";

factory/fac_iterfor.h

@@ -1 +1 @@
 // emacs edit mode for this file is -*- C++ -*-
-// $Id: fac_iterfor.h,v 1.0 1996-05-17 10:59:40 stobbe Exp $
+// $Id: fac_iterfor.h,v 1.1 1996-07-08 08:18:49 stobbe Exp $
 
 #ifndef INCL_ITERFOR_H
@@ -7 +7 @@
 /*
 $Log: not supported by cvs2svn $
+Revision 1.0  1996/05/17 10:59:40  stobbe
+Initial revision
+
 */
 
@@ -15 +18 @@
 private:
     int MAX;
+    int FROM;
+    int TO;
     int N;
     bool last;
@@ -21 +26 @@
     void fill ( int from, int n );
 public:
-    IteratedFor( int n, int max );
+    IteratedFor( int from, int to, int max );
     IteratedFor( const IteratedFor & );
     ~IteratedFor();
     IteratedFor& operator= ( const IteratedFor & );
-    int n() const { return N; }
+    int from() const { return FROM; }
+    int to() const { return TO; }
+    int n() const { return N; };
     int max() const { return MAX; }
     void nextiteration();