Changeset 5bcb3f in git

Timestamp:

Oct 27, 2014, 3:44:39 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

0b7fb89c0352a1d5f5996c80b66dbeae73a4a7ea

Parents:

e35d92b57a92eda11cfceda8863bc5aec0053766

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-27 15:44:39+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-10-31 17:55:06+01:00

Message:

Syzextra: minor changes / treeoutput

File:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (19 diffs)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -961 +961 @@
   if( __TREEOUTPUT__ )
   {
-     PrintS("{ \"nodelabel\": \""); writeLatexTerm(a, R); PrintS("\", \"children\": [");
-  }
-
+     PrintS("{ \"proc\": \"TraverseNF\", \"nodelabel\": \""); writeLatexTerm(a, R); PrintS("\", \"children\": [");
+  }
 
   poly aa = leadmonom(a, R); assume( aa != NULL); // :(
@@ -983 +982 @@
     if( __TREEOUTPUT__ )
     {
-       PrintS("{ \"nodelabel\": \""); writeLatexTerm(a2, R); PrintS("\", \"children\": [");
+       PrintS("{ \"proc\": \"TraverseNF2\", \"nodelabel\": \""); writeLatexTerm(a2, R); PrintS("\", \"children\": [");
     }
 
@@ -995 +994 @@
     p_Delete(&aa2, R);
 
-    if( __TREEOUTPUT__ )
-       PrintS("]},");
 
 #ifndef SING_NDEBUG
@@ -1005 +1002 @@
     }
 #endif
+
+    if( __TREEOUTPUT__ )
+      PrintS("], \"noderesult\": \""); writeLatexTerm(t, R, true, false); PrintS("\" },");
+    
   } else
     t = p_Add_q(t, ReduceTerm(aa, L->m[r], a), R);
@@ -1010 +1011 @@
   p_Delete(&aa, R);
 
-  // TODO: print t???
-
   if( __TREEOUTPUT__ )
   {
-    poly tt = pp_Add_qq( a, t, R);  // TODO: ADD a?
-    PrintS("], \"noderesult\": \""); writeLatexTerm(tt, R, true, false); PrintS("\", \"proc\": \"TraverseNF\" },");
+    poly tt = pp_Add_qq( a, t, R);    
+    PrintS("], \"noderesult\": \""); writeLatexTerm(tt, R, true, false); PrintS("\" },");
     p_Delete(&tt, R);
   }
@@ -1342 +1341 @@
 }
 
-#define NOPRODUCT 0
+#define NOPRODUCT 1
 
 poly SchreyerSyzygyComputation::SchreyerSyzygyNF(const poly syz_lead, poly syz_2) const
@@ -1545 +1544 @@
          return (NULL);
 
-       poly p = p_Copy(itr->second, r); // no copy???
-
        if( __TREEOUTPUT__ )
        {
 //         PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false);
 //         Print("  \\\\GEN{%d}\", \"children\": [ ", tail + 1);
-         PrintS("{ \"proc\": \"TraverseTail-lookup\", \"nodelabel\": \"");
-         writeLatexTerm(multiplier, r, false); Print(" \\\\GEN{%d}\", \"look-up-poly\": \"", tail + 1);
-         writeLatexTerm(p, r, true, false);
+         PrintS("{ \"proc\": \"TTLookup\", \"nodelabel\": \"");
+         writeLatexTerm(itr->first, r, false); Print(" \\\\GEN{%d}\", \"Lookup\": \"", tail + 1);
+         writeLatexTerm(itr->second, r, true, false);
          PrintS("\", ");
        }
+       
+       poly p = p_Copy(itr->second, r); // COPY!!!
+
 
        if( !n_Equal( pGetCoeff(multiplier), pGetCoeff(itr->first), r) ) // normalize coeffs!?
        {
-         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r);
-         p = p_Mult_nn(p, n, r);
+         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r); // new number
+         
+         if( __TREEOUTPUT__ )
+         {
+           StringSetS("");
+           n_Write(n, r);
+           char* s = StringEndS();
+           Print("\"recale\": \"%s\", ", s);
+           omFree(s);
+         }
+         
+         p = p_Mult_nn(p, n, r); // !
          n_Delete(&n, r);
-
-         if( __TREEOUTPUT__ )
-           PrintS("\"rescale\": \"1\", ");
-       } else
-       {
-         if( __TREEOUTPUT__ )
-           PrintS("\"rescale\": \"0\", ");
        }
 
        if( __TREEOUTPUT__ )
        {
-         PrintS("\"noderesult\": \"");
-         writeLatexTerm(p, r, true, false);
-         PrintS("\" },");
+         PrintS("\"noderesult\": \"");         writeLatexTerm(p, r, true, false);         PrintS("\" },");
        }
 
 #ifndef SING_NDEBUG
-       if( __DEBUG__ )
-       {
-         m_div.Verify();
-         m_checker.Verify();
-       }
+       if( __DEBUG__ )       {         m_div.Verify();         m_checker.Verify();       }
 #endif
        
@@ -1592 +1589 @@
      if( __TREEOUTPUT__ )
      {
-       PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); Print(" \\\\GEN{%d}\", \"children\": [", tail + 1);
+       Print("{ \"proc\": \"TTStore%d\", \"nodelabel\": \"", tail + 1); writeLatexTerm(multiplier, r, false); Print(" \\\\GEN{%d}\", \"children\": [", tail + 1);
      }
      
      const poly p = ComputeImage(multiplier, tail);
 
+     if( __TREEOUTPUT__ )
+     {
+       PrintS("], \"noderesult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
+     }
+
      T.insert( TP2PCache::value_type(p_Copy(multiplier, r), p) ); //     T[ multiplier ] = p;
 
 //     if( p == NULL )
 //        return (NULL);
-
-     if( __TREEOUTPUT__ )
-     {
-       PrintS("], \"noderesult\": \""); writeLatexTerm(p, r, true, false); PrintS("\", \"proc\": \"TraverseTail-compute-and-store1\" },");
-     }
 
 #ifndef SING_NDEBUG
@@ -1622 +1619 @@
   if( __TREEOUTPUT__ )
   {
-    PrintS("{ \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); Print(" \\\\GEN{%d}\", \"children\": [", tail + 1);
+    Print("{ \"proc\": \"TTStore%d\", \"nodelabel\": \"", 0); writeLatexTerm(multiplier, r, false); Print(" \\\\GEN{%d}\", \"children\": [", tail + 1);
   }
 
@@ -1628 +1625 @@
   const poly p = ComputeImage(multiplier, tail);
 
+  if( __TREEOUTPUT__ )
+  {
+    PrintS("], \"noderesult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
+  }
+  
   T.insert( TP2PCache::value_type(p_Copy(multiplier, r), p) );
 
@@ -1635 +1637 @@
 //    return (NULL);
 
-  if( __TREEOUTPUT__ )
-  {
-    PrintS("], \"noderesult\": \""); writeLatexTerm(p, r, true, false); PrintS("\", \"proc\": \"TraverseTail-compute-and-store2\" },");
-  }
-
 #ifndef SING_NDEBUG
   if( __DEBUG__ )
@@ -1653 +1650 @@
 poly SchreyerSyzygyComputation::ComputeImage(poly multiplier, const int tail) const
 {
+  const ring& r = m_rBaseRing;
+
+  assume(m_idTails !=  NULL && m_idTails->m != NULL);
+  assume( tail >= 0 && tail < IDELEMS(m_idTails) );
+  
   const poly t = m_idTails->m[tail]; // !!!
 
   if(t != NULL)
-    return TraverseTail(multiplier, t);
+  {
+    if( __TREEOUTPUT__ )
+    {
+      PrintS("{ \"proc\": \"ComputeImage\", \"nodelabel\": \"");
+      writeLatexTerm(multiplier, r, false);
+      Print(" \\\\GEN{%d}\", \"edgelabel\": \"", tail + 1);
+      writeLatexTerm(t, r, false);
+      PrintS("\", \"children\": [");
+    }
+    
+    const poly p = TraverseTail(multiplier, t);
+
+    if( __TREEOUTPUT__ )
+    {
+      PrintS("], \"noderesult\": \""); writeLatexTerm(p, r, true, false); PrintS("\" },");
+    }
+    
+    return p;
+    
+  }
 
   return NULL;
@@ -1683 +1704 @@
   assume( T != NULL );
 
-
   if( (!__TAILREDSYZ__) || m_lcm.Check(multiplier) )
   {
@@ -1695 +1715 @@
 //    CPolynomialSummator sum(r, bUsePolynomial);
 //    poly s = NULL;
+
+    if( __TREEOUTPUT__ )
+    {
+      Print("{ \"proc\": \"TTPoly\", \"nodelabel\": \""); writeLatexTerm(multiplier, r, false); Print(" * \\\\ldots \", \"children\": [");
+    }
+    
     for(poly p = tail; p != NULL; p = pNext(p))   // iterate over the tail
     {
@@ -1720 +1746 @@
 #endif
 
+    if( __TREEOUTPUT__ )
+    {
+      PrintS("], \"noderesult\": \""); writeLatexTerm(s, r, true, false); PrintS("\" },");
+    }   
+
     return s;
   }
@@ -1775 +1806 @@
     {
       poly product = pp_Mult_mm(multiplier, term4reduction, r);
-      PrintS("{ \"proc\": \"ReduceTerm-NOPRODUCT\", \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelabel\": \""); writeLatexTerm(product, r, false);
+      PrintS("{ \"proc\": \"RdTrmNoP\", \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelabel\": \""); writeLatexTerm(product, r, false);
       p_Delete(&product, r);
     }
@@ -1789 +1820 @@
     if( __TREEOUTPUT__ )
     {
-      PrintS("{ \"proc\": \"ReduceTerm-PRODUCT\", \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelabel\": \""); writeLatexTerm(product, r, false);
+      PrintS("{ \"proc\": \"RdTrmP\", \"nodelabel\": \""); writeLatexTerm(s, r); PrintS("\", \"edgelabel\": \""); writeLatexTerm(product, r, false);
     }
 
@@ -1804 +1835 @@
 #endif
 
-#ifndef SING_NDEBUG
-  if( __DEBUG__ )
-  {
-    m_div.Verify();
-    m_checker.Verify();
-  }
-#endif
-  
   if( s == NULL ) // No Reducer?
     return s;
-
-
+  
   poly b = leadmonom(s, r);
 
@@ -1835 +1857 @@
     PrintS("], \"noderesult\": \"");
     writeLatexTerm(s, r, true, false);
-    PrintS("\" },"); 
-  }
-
+    PrintS("\"");
+
+    if( syztermCheck != NULL )
+    {
+      PrintS(", \"syztermCheck\":\"" );
+      writeLatexTerm(syztermCheck, r, true, false);
+      PrintS("\" },");      
+    } else
+      PrintS(" },");
+  }
+
+  
 #ifndef SING_NDEBUG
   if( __DEBUG__ )