Changeset 06879b7 in git

Timestamp:

May 15, 2008, 7:24:37 PM (15 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

f0aec5f202b35e6e5b438f20d75f4b4259253ecd

Parents:

5eef8d3b7ed576b438d4c0ff4dee494bee712c3f

Message:

*motsak: additional controls for testing/debugging/benchmarking
   gring | Use NC Extensions (SCA)
   sca   | Force Commutative


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

Location:

kernel

Files:

• gring.cc (modified) (4 diffs)
• sca.cc (modified) (10 diffs)
• sca.h (modified) (2 diffs)

kernel/gring.cc

@@ -7 +7 @@
  *  Author:  levandov (Viktor Levandovsky)
  *  Created: 8/00 - 11/00
- *  Version: $Id: gring.cc,v 1.52 2008-04-18 12:11:40 motsak Exp $
+ *  Version: $Id: gring.cc,v 1.53 2008-05-15 17:24:36 motsak Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -31 +31 @@
 // dirty tricks:
 #include "p_MemAdd.h"
+
+bool bUseExtensions = true;
 
 /* global nc_macros : */
@@ -2835 +2837 @@
   gnc_p_ProcsSet(rGR, p_Procs);
 
-  if(rIsSCA(rGR))
+  if(rIsSCA(rGR) && bUseExtensions)
   {
     sca_p_ProcsSet(rGR, p_Procs);
@@ -3275 +3277 @@
 {
   // currently only super-commutative extension deals with factors.
-  return sca_SetupQuotient(rGR, rG);
+  if( bUseExtensions ) 
+    return sca_SetupQuotient(rGR, rG);
+  
+  return false;    
 }
 

kernel/sca.cc

@@ -7 +7 @@
  *  Author:  motsak (Oleksandr Motsak)
  *  Created: 2006/12/18
- *  Version: $Id: sca.cc,v 1.14 2008-05-09 09:27:24 Singular Exp $
+ *  Version: $Id: sca.cc,v 1.15 2008-05-15 17:24:36 motsak Exp $
  *******************************************************************/
 
@@ -1253 +1253 @@
     return false;
 
-  if(ncRingType(rG) != nc_skew)
-    return false;
+#if MYTEST
+   PrintS("sca_SetupQuotient(rGR, rG)");
+#endif
+
+
+//  if( (ncRingType(rG) != nc_skew) || (ncRingType(rG) != nc_comm) )
+//    return false;
 
   if(rGR->qideal == NULL) // there will be a factor!
@@ -1287 +1292 @@
         if( !n_IsOne(c, rBase) )
         {
-#ifdef PDEBUG
-//           Print("Wrong Coeff at: [%d, %d]\n", i, j);
+#if MYTEST
+           Print("Wrong Coeff at: [%d, %d]\n", i, j);
 #endif
           return false;
@@ -1310 +1315 @@
         if( !n_IsMOne(c, rBase) )
         {
-#ifdef PDEBUG
-//           Print("Wrong Coeff at: [%d, %d]\n", i, j);
+#if MYTEST
+           Print("Wrong Coeff at: [%d, %d]\n", i, j);
 #endif
           return false;
@@ -1319 +1324 @@
         if( !n_IsOne(c, rBase) )
         {
-#ifdef PDEBUG
-//           Print("Wrong Coeff at: [%d, %d]\n", i, j);
+#if MYTEST
+           Print("Wrong Coeff at: [%d, %d]\n", i, j);
 #endif
           return false;
@@ -1381 +1386 @@
 
 
-#ifdef PDEBUG
-//  Print("AltVars: [%d, %d]\n", iAltVarStart, iAltVarEnd);
+#if MYTEST
+  Print("AltVars: [%d, %d]\n", iAltVarStart, iAltVarEnd);
 #endif
 
@@ -1404 +1409 @@
 
 
-
   sca_p_ProcsSet(rGR, rGR->p_Procs);
 
 
   return true;
+}
+
+
+bool sca_ForceCommutative(ring rGR, int b, int e)
+{
+  assume(rGR != NULL);
+  assume(rIsPluralRing(rGR));
+  assume(!rIsSCA(rGR));
+  
+  const int N = rGR->N;
+
+  ring rSaveRing = currRing;
+
+  if(rSaveRing != rGR)
+    rChangeCurrRing(rGR);
+
+  const ideal idQuotient = rGR->qideal;
+
+  
+  ideal tempQ = idQuotient;
+
+  if( b <= N && e >= 1 )
+    tempQ = id_KillSquares(idQuotient, b, e, rGR); 
+
+  idSkipZeroes( tempQ );
+
+  if( idIs0(tempQ) )
+    rGR->nc->SCAQuotient() = NULL;
+  else
+    rGR->nc->SCAQuotient() = tempQ;
+  
+  ncRingType( rGR, nc_exterior );
+
+  scaFirstAltVar( rGR, b );
+  scaLastAltVar( rGR, e );
+
+
+  sca_p_ProcsSet(rGR, rGR->p_Procs);
+
+  if(rSaveRing != rGR)
+    rChangeCurrRing(rSaveRing);
+  
+  return true;
+  
 }
 
@@ -2378 +2426 @@
 #ifdef PDEBUG
   p_Test(m, r);
+  assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
 
 #if 0
@@ -2402 +2451 @@
 #ifdef PDEBUG
   p_Test(p, r);
+
+  assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
 
 #if 0
@@ -2455 +2506 @@
   if (id == NULL) return id; // zero ideal
 
+  assume( (iFirstAltVar >= 1) && (iLastAltVar <= r->N) && (iFirstAltVar <= iLastAltVar) );
+  
   const int iSize = id->idelems();
 

kernel/sca.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: sca.h,v 1.10 2007-07-24 11:15:26 Singular Exp $ */
+/* $Id: sca.h,v 1.11 2008-05-15 17:24:37 motsak Exp $ */
 
 #include <ring.h>
@@ -175 +175 @@
   const unsigned int iFirstAltVar, const unsigned int iLastAltVar, 
   const ring r); 
+
+// for benchmarking
+bool sca_ForceCommutative(ring rGR, int b, int e);