Changeset 847ebdd in git for factory

Timestamp:

Mar 31, 1998, 12:36:02 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

Children:

751138e12946462278cccd137b6f8ae5f426a649

Parents:

bc82d60fa171675a0c23a3e2051318500187aa39

Message:

***** merge from branch `factory-gcd' to main trunk


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

Location:

factory/ftest

Files:

• ChangeLog (modified) (1 diff)
• ftest_io.cc (modified) (2 diffs)

factory/ftest/ChangeLog

@@ +1 @@
+Tue Mar 31 12:33:25 MET DST 1998  Jens Schmidt
+
+        * ChangeLog, ftest_io.cc, fbinops.m4:
+          ***** merge from branch `factory-gcd' to main trunk
+
+Thu Mar 26 09:29:36 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
+
+    **************** <<< changes in branch `factory-gcd' ****************
+
+    **************** !!!!! Repository changed !!!!! ****************
+
+        * gcdUniv0.fex, gcdUnivP.fex, gcdUnivPAlpha.fex, insert.fex,
+          runfex, stdUniv0Gcd.in, stdUnivPGcd.in: files moved in
+          repository from `factory/ftest' to `factory/fex'
+
+    **************** !!!!! Repository changed !!!!! ****************
+
+        * stdUniv0Gcd.in, stdUnivPGcd.in: new files
+
+        * gcd.m4 (main): reads optional argument `algorithm' and calls it
+          using `CFPrimitiveGcdUtil::gcd()'
+          (gcdCheck): compares old and new gcd's
+
+        * gcd.m4 (normalizeGcd): new function.  Calls added to
+          `gcdCheck()'
+
+        * gcd.m4 (gcdCheck): declared static
+
+        * runfex (printData): new output option `x'.  Column width is
+          adjustable (to zero, too) ar runtime.
+
+        * gcdUnivPAlpha.fex: new file
+
+        * gcdUnivP.fex: prefix `univP' removed from all identifiers
+
+        * gcdUnivP.fex: new file
+
+        * ftest_io.cc (ftestGetCanonicalForm): ignores trailing blanks
+          when reading `-'
+
+        * ftest_io.cc (ftestGetCanonicalForm): `<-' as "read from stdin"
+          specifier replaced by `-'
+
+Wed Mar 25 08:35:01 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
+
+        * runfex: option `-t' added
+
+Tue Mar 24 11:28:50 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
+
+        * runfex (usage): new function.  Calls added to main program.
+
+        * runfex (printData): uses stdin instead of `alg*' variables to
+          read data from algorithm.  `example()' adapted.
+
+        * runfex (runAlgorithm): bug fix
+
+        * runfex (signalHandlerInterrupt, signalHandleQuit): new functions
+          (trap): handles signals better
+
+        * insert.fex: adapted to new `runfex' format
+
+        * gcd.fex: file splitted up in several smaller files
+        * gcdUniv0.fex: new file
+
+        * runfex: major rewrite.  Hopefully the last one.
+
+Mon Mar 23 17:46:57 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
+
+        * randomgcd.m4, ranMulGCD.fex: files removed
+
+        * gcd.fex (collection gcd): `-c 50' removed
+
+        * fbinops.m4 (ftestDivideTest, ftestDivTest, ftestModuloTest): new
+          functions
+          (binOpCFSpecArray): new entries added for `div()' and `mod()'.
+          Extra tests for `operator /()' and `operator %()' added.
+
+    **************** >>> changes in branch `factory-gcd' ****************
+
 Mon Mar 23 16:38:41 1998  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
 

factory/ftest/ftest_io.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: ftest_io.cc,v 1.11 1998-03-11 16:10:54 schmidt Exp $ */
+/* $Id: ftest_io.cc,v 1.12 1998-03-31 10:36:02 schmidt Exp $ */
 
 //{{{ docu
@@ -34 +34 @@
     const char * stringF = canFormSpec;
     stringF = ftestSkipBlancs( stringF );
-    if ( *stringF == '<' ) {
-        CanonicalForm f;
-        
-        stringF++;
-        if ( *stringF == '-' ) {
-            // read canonical form from stdin
+
+    // check for a single minus
+    if ( stringF[0] == '-' ) {
+        const char * tokenCursor = ftestSkipBlancs( stringF+1 );
+
+        if ( ! *tokenCursor ) {
+            CanonicalForm f;
             cin >> f;
-        } else
+            return f;
+        }
+    }
+
+    // get string to read canonical form from
+    if ( *stringF == '$' ) {
+        const char * tokenCursor = ftestSkipBlancs( stringF+1 );
+        // read canonical form from environment
+        stringF = getenv( tokenCursor );
+        if ( ! stringF )
             ftestError( CanFormSpecError,
-                        "not a valid canonical form specification `<%s'\n",
-                        stringF );
-        return f;
-    } else {
-        // get string to read canonical form from
-        if ( *stringF == '$' ) {
-            const char * tokenCursor = ftestSkipBlancs( stringF+1 );
-            // read canonical form from environment
-            stringF = getenv( tokenCursor );
-            if ( ! stringF )
-                ftestError( CanFormSpecError,
-                            "no environment variable `$%s' set\n",
-                            tokenCursor );
+                        "no environment variable `$%s' set\n",
+                        tokenCursor );
+    }
+
+    // create terminated CanonicalForm
+    int i = strlen( stringF );
+    char * terminatedStringF = new char[i+2];
+    char * stringCursor = terminatedStringF;
+    while ( *stringF ) {
+        switch ( *stringF ) {
+        case '.': *stringCursor = '*'; break;
+        case '{': *stringCursor = '('; break;
+        case '}': *stringCursor = ')'; break;
+        default: *stringCursor = *stringF; break;
         }
-
-        // create terminated CanonicalForm
-        int i = strlen( stringF );
-        char * terminatedStringF = new char[i+2];
-        char * stringCursor = terminatedStringF;
-        while ( *stringF ) {
-            switch ( *stringF ) {
-            case '.': *stringCursor = '*'; break;
-            case '{': *stringCursor = '('; break;
-            case '}': *stringCursor = ')'; break;
-            default: *stringCursor = *stringF; break;
-            }
-            stringF++; stringCursor++;
-        }
-        *stringCursor++ = ';';
-        *stringCursor = '\0';
-
-        // read f and return it
-        CanonicalForm f;
-        istrstream( terminatedStringF ) >> f;
-        delete [] terminatedStringF;
-        return f;
-    }
+        stringF++; stringCursor++;
+    }
+    *stringCursor++ = ';';
+    *stringCursor = '\0';
+
+    // read f and return it
+    CanonicalForm f;
+    istrstream( terminatedStringF ) >> f;
+    delete [] terminatedStringF;
+    return f;
 }
 //}}}