Changeset ff12c6 in git

Timestamp:

Oct 8, 2012, 6:44:02 PM (10 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

7ec05993a90b8b8d6cd1f03ce111460365a98194

Parents:

e9927ff3cc13ebaddd8a4a7419c26390ff895c18

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-10-08 18:44:02+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-10-08 20:37:21+02:00

Message:

Testing of ClearContent&ClearDenominators

add: testing the use of CPolyCoeffsEnumerator by n_ClearDenominators and n_ClearContent
add/chg: better generic testing of Clear* functions
add: more testing of Clear* functions: cleardenom + ERROR() + exit on wrong test result
add: testing of "-leadcoeff" normalization (for TestClearContent) but not for TestClearDenominators...
NOTE: ClearContent should make leading coeff. positive!
NOTE: testing alg. and trans. extensions of Q aswell as Q itself

add: Added testing of Clear* to 'make check'

Files:

• Singular/LIB/schreyer.lib (modified) (2 diffs)
• dyn_modules/syzextra/mod_main.cc (modified) (3 diffs)
• dyn_modules/syzextra/test.sh (modified) (1 diff)
• dyn_modules/syzextra/test_clear_enum.tst (added)

Singular/LIB/schreyer.lib

@@ -1404 +1404 @@
         listvar(Syzextra);
       }
+
+      exportto(Top, Syzextra::ClearContent);
+      exportto(Top, Syzextra::ClearDenominators);
       
 //      export Syzextra;
@@ -1439 +1442 @@
       }
       
+      exportto(Top, Syzextra_g::ClearContent);
+      exportto(Top, Syzextra_g::ClearDenominators);
+
 //      export Syzextra_g;
 //      exportto(Schreyer, Syzextra_g::noop);

dyn_modules/syzextra/mod_main.cc

@@ -6 +6 @@
 
 #include <coeffs/coeffs.h>
+
+#include <polys/PolyEnumerator.h>
 
 #include <polys/monomials/p_polys.h>
@@ -45 +47 @@
   res->data = NULL;
 }
+
+/// wrapper around n_ClearContent
+static BOOLEAN _ClearContent(leftv res, leftv h)
+{
+  NoReturn(res);
+
+  const char *usage = "'ClearContent' needs a (non-zero!) poly or vector argument...";
+  
+  if( h == NULL )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+
+  assume( h != NULL );
+
+  if( !( h->Typ() == POLY_CMD || h->Typ() == VECTOR_CMD) )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+
+  assume (h->Next() == NULL);
+  
+  poly ph = reinterpret_cast<poly>(h->Data());
+  
+  if( ph == NULL )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+  
+  const ring r =  currRing;
+  assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
+
+  number n;
+
+  // experimentall (recursive enumerator treatment) of alg. ext
+  CPolyCoeffsEnumerator itr(ph);
+  n_ClearContent(itr, n, C);
+
+  res->data = n;
+  res->rtyp = NUMBER_CMD;
+
+  return FALSE;
+}
+
+/// wrapper around n_ClearDenominators
+static BOOLEAN _ClearDenominators(leftv res, leftv h)
+{
+  NoReturn(res);
+
+  const char *usage = "'ClearDenominators' needs a (non-zero!) poly or vector argument...";
+
+  if( h == NULL )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+
+  assume( h != NULL );
+
+  if( !( h->Typ() == POLY_CMD || h->Typ() == VECTOR_CMD) )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+
+  assume (h->Next() == NULL);
+
+  poly ph = reinterpret_cast<poly>(h->Data());
+
+  if( ph == NULL )
+  {
+    WarnS(usage);
+    return TRUE;
+  }
+
+  const ring r =  currRing;
+  assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
+
+  number n;
+
+  // experimentall (recursive enumerator treatment) of alg. ext.
+  CPolyCoeffsEnumerator itr(ph);
+  n_ClearDenominators(itr, n, C);
+
+  res->data = n;
+  res->rtyp = NUMBER_CMD;
+
+  return FALSE;
+}
+
 
 /// try to get an optional (simple) integer argument out of h
@@ -851 +946 @@
 // #define ADD(A,B,C,D,E) ADD0(iiAddCproc, "", C, D, E)
   #define ADD(A,B,C,D,E) ADD0(A->iiAddCproc, B, C, D, E)
+  ADD(psModulFunctions, currPack->libname, "ClearContent", FALSE, _ClearContent);
+  ADD(psModulFunctions, currPack->libname, "ClearDenominators", FALSE, _ClearDenominators);
+
   ADD(psModulFunctions, currPack->libname, "DetailedPrint", FALSE, DetailedPrint);
   ADD(psModulFunctions, currPack->libname, "leadmonomial", FALSE, leadmonom);

dyn_modules/syzextra/test.sh

@@ -2 +2 @@
 
 # env
+"$SINGULAR_EXECUTABLE" -teq "$srcdir/test_clear_enum.tst"
 
 "$SINGULAR_EXECUTABLE" -teq "$srcdir/syzextra.tst" && "$SINGULAR_EXECUTABLE" -teq "$srcdir/ederc.tst"