Changeset 9982049 in git

Timestamp:

Aug 13, 2009, 7:31:50 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6a4509cdda6450d69b9c13e445571024e407a07d

Parents:

e024c6c7d55e55f6cf66fb9de0d37e618f6e601a

Message:

*motsak: some fixes and addons


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

Location:

kernel

Files:

• ideals.cc (modified) (3 diffs)
• kstd1.cc (modified) (2 diffs)
• kstd2.cc (modified) (2 diffs)
• kutil.cc (modified) (3 diffs)
• mod2.h.in (modified) (2 diffs)
• p_polys.cc (modified) (1 diff)
• ring.cc (modified) (2 diffs)

kernel/ideals.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ideals.cc,v 1.76 2009-07-27 08:31:18 Singular Exp $ */
+/* $Id: ideals.cc,v 1.77 2009-08-13 17:31:49 motsak Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate ideals
@@ -70 +70 @@
 }
 
-#ifndef __OPTIMIZE__
-// this is mainly for outputting an ideal within the debugger
+//#ifndef __OPTIMIZE__
+// this is mainly for outputting an ideal within the debugger & DetailedPrint
 void idShow(const ideal id, const ring lmRing, const ring tailRing, const int debugPrint)
 {
@@ -91 +91 @@
   }
 }
-#endif
+//#endif
 
 /*2

kernel/kstd1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd1.cc,v 1.57 2009-07-27 08:31:44 Singular Exp $ */
+/* $Id: kstd1.cc,v 1.58 2009-08-13 17:31:49 motsak Exp $ */
 /*
 * ABSTRACT:
@@ -1764 +1764 @@
 
 #if MYTEST
-  PrintS("kSTD: currRing: "); rWrite(currRing);
+  if (TEST_OPT_DEBUG)
+  {
+    PrintS("// kSTD: currRing: ");
+    rWrite(currRing);
+  }
 #endif
 

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.99 2009-07-20 12:00:51 motsak Exp $ */
+/* $Id: kstd2.cc,v 1.100 2009-08-13 17:31:49 motsak Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1002 +1002 @@
 #ifdef KDEBUG
 #if MYTEST
-  PrintS("bba start GB: currRing: ");
-  rWrite(currRing);PrintLn(); rDebugPrint(currRing);
-  PrintLn();
-
-  if(strat->tailRing != NULL && strat->tailRing != currRing)
-  {
-    PrintS("bba start GB: tailRing: ");
-    rWrite(strat->tailRing);PrintLn(); rDebugPrint(strat->tailRing);
+  if (TEST_OPT_DEBUG)
+  {  
+    PrintS("bba start GB: currRing: ");
+    // rWrite(currRing);PrintLn();
+    rDebugPrint(currRing);
+    PrintLn();
+
+    if(strat->tailRing != NULL && strat->tailRing != currRing)
+    {
+      PrintS("// **** bba start GB: tailRing: ");
+      rWrite(strat->tailRing);PrintLn(); rDebugPrint(strat->tailRing);
+    }
   }
 #endif /* MYTEST */

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.149 2009-07-28 14:15:05 Singular Exp $ */
+/* $Id: kutil.cc,v 1.150 2009-08-13 17:31:50 motsak Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1586 +1586 @@
       if (TEST_OPT_DEBUG)
       {
-        PrintS("strat->S[i]: "); pWrite(strat->S[i]);
+        PrintS("enterOnePairNormal::\n strat->S[i]: "); pWrite(strat->S[i]);
         PrintS("p: "); pWrite(p);
         PrintS("SPoly: "); pWrite(Lp.p);
@@ -1601 +1601 @@
       if (TEST_OPT_DEBUG)
       {
-        PrintS("strat->S[i]: "); pWrite(strat->S[i]);
+        PrintS("enterOnePairNormal::\n strat->S[i]: "); pWrite(strat->S[i]);
         PrintS("p: "); pWrite(p);
         PrintS("commutative SPoly: "); pWrite(Lp.p);

kernel/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.40 2009-07-28 14:15:05 Singular Exp $
+ *  Version: $Id: mod2.h.in,v 1.41 2009-08-13 17:31:50 motsak Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -109 +109 @@
 #undef HAVE_SIGINTERRUPT
 /* define for boost includes and lib */
-#undef HAVE_BOOST_DYNAMIC_BITSET_HPP
+/////////////////////// #undef HAVE_BOOST_DYNAMIC_BITSET_HPP
 /* define for std:vector includes */
 #undef USE_STDVECBOOL

kernel/p_polys.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_polys.cc,v 1.18 2009-07-20 12:00:51 motsak Exp $
+ *  Version: $Id: p_polys.cc,v 1.19 2009-08-13 17:31:50 motsak Exp $
  *******************************************************************/
 
+
 #include "mod2.h"
+
+#ifndef NDEBUG
+# define MYTEST 0
+#else /* ifndef NDEBUG */
+# define MYTEST 0
+#endif /* ifndef NDEBUG */
+
 #include "structs.h"
 #include "structs.h"

kernel/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.127 2009-07-28 10:01:32 Singular Exp $ */
+/* $Id: ring.cc,v 1.128 2009-08-13 17:31:50 motsak Exp $ */
 
 /*
@@ -4155 +4155 @@
   else
     PrintS("0\n");
+}
+
+
+
+//    F = system("ISUpdateComponents", F, V, MIN );
+//    // replace gen(i) -> gen(MIN + V[i-MIN]) for all i > MIN in all terms from F!
+void pISUpdateComponents(ideal F, const intvec *const V, const int MIN, const ring r = currRing)
+{
+  assume( V != NULL );
+  assume( MIN >= 0 );
+
+  if( F == NULL )
+    return;
+
+  for( int j = (F->ncols*F->nrows) - 1; j >= 0; j-- )
+  {
+#ifdef PDEBUG
+    Print("F[%d]:", j);
+    p_DebugPrint(F->m[j], r, r, 0);
+#endif
+    
+    for( poly p = F->m[j]; p != NULL; pIter(p) )
+    {      
+      int c = p_GetComp(p, r);
+
+      if( c > MIN )
+      {
+#ifdef PDEBUG    
+        Print("gen[%d] -> gen(%d)\n", c, MIN + (*V)[ c - MIN - 1 ]);
+#endif
+        
+        p_SetComp( p, MIN + (*V)[ c - MIN - 1 ], r );
+      }
+    }
+#ifdef PDEBUG    
+    Print("new F[%d]:", j);
+    p_Test(F->m[j], r);
+    p_DebugPrint(F->m[j], r, r, 0);
+#endif
+  }
+
 }