Changeset bc82d6 in git for factory

Timestamp:

Mar 31, 1998, 12:23:59 PM (26 years ago)

Author:

Jens Schmidt <schmidt@…>

Branches:

(u'spielwiese', '2fa36c576e6a4ddbb1093b43c7f8e9835e17e52a')

Children:

847ebddd2a19445d1f5f58aa9aae2175e2ba965c

Parents:

cc94b0aa665105d616f94ce4f3c3cd02b336adca

Message:

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


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

File:

• factory/ftest/fbinops.m4 (modified) (4 diffs)

factory/ftest/fbinops.m4

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fbinops.m4,v 1.3 1997-12-17 12:16:40 schmidt Exp $ */
+/* $Id: fbinops.m4,v 1.4 1998-03-31 10:23:59 schmidt Exp $ */
 
 ftestSetNameOfGame( fbinops, `"
@@ -7 +7 @@
 
   The following operators (with aliases) are recognized:
-  `+', `-', `*' (= `mul'), `/', `%': return a canonicalform;
+  `+', `-', `*' (= `mul'), `/', `div', `%', `mod': return a canonicalform;
   `==', `!=', `<' (= `lt'), `>' (= `gt'): return an integer (i.e. boolean)
 "'`' )
@@ -157 +157 @@
     return UndefinedResult;
 }
+
+static ftestStatusT
+ftestDivideTest( const CanonicalForm & f, const CanonicalForm & g, const CanonicalForm & quot )
+{
+    if ( ! ((quot*g)+(f%g)-f).isZero() ) {
+        ftestError( CheckError, "f != (f/g)*g+(f%%g)\n" );
+        return Failed;
+    } else
+        return Passed;
+}
+
+static ftestStatusT
+ftestDivTest( const CanonicalForm & f, const CanonicalForm & g, const CanonicalForm & quot )
+{
+    if ( ! (f%g).isZero() ) {
+        ftestError( CheckError, "g does not divide f\n" );
+        return Failed;
+    } else if ( f != (quot*g) ) {
+        ftestError( CheckError, "f != (div(f, g)*g)\n" );
+        return Failed;
+    } else
+        return Passed;
+}
+
+static ftestStatusT
+ftestModuloTest( const CanonicalForm & f, const CanonicalForm & g, const CanonicalForm & rem )
+{
+    if ( ! (((f/g)*g)+(rem)-f).isZero() ) {
+        ftestError( CheckError, "f != (f/g)*g+(f%%g)\n" );
+        return Failed;
+    } else
+        return Passed;
+}
 //}}}
 
@@ -171 +204 @@
     { &operator*, ftestArithTest, "*", "f*g" },
     { &operator*, ftestArithTest, "mul", "f*g" },
-    { &operator/, ftestArithTest, "/", "f/g" },
-    { &operator%, ftestArithTest, "%", "f%g" },
+    { &operator/, ftestDivideTest, "/", "f/g" },
+    { &div, ftestDivTest, "div", "div(f,g)" },
+    { &operator%, ftestModuloTest, "%", "f%g" },
+    { &mod, ftestModuloTest, "mod", "mod(f,g)" },
     { 0, 0, 0, 0 }
 };