Changeset f0e1f6 in git

Timestamp:

Jul 8, 2015, 5:20:03 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c5facdfddea2addfd91babd8b9019161dea4b695')

Children:

fc2acfd428dd5e231de749822606dc0022513406

Parents:

c0bd77020adecedd9342933c8012f790404e23aa

Message:

opt. preimage (improved ordering)

Files:

• Tst/Old/preimage.res.gz.uu (modified) (2 diffs)
• Tst/Short/elimlib_s.res.gz.uu (modified) (1 diff)
• kernel/preimage.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (4 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Tst/Old/preimage.res.gz.uu

@@ -1 +1 @@
 begin 640 preimage.res.gz
-M'XL("#OH\4T``W!R96EM86=E+G)E<P"=DDUOVS`,AN_Y%42Q0XH(:T3EJRV<
+M'XL("%4OG54``W!R96EM86=E+G)E<P"=DDUOVS`,AN_Y%42Q0XH(:T3EJRV<
 MP[9+@6&7[C8$@Y/8G;0X"61WL?WKIV\IWH`5TT4$*?'E0_+YZZ>G+P!`UR#Y
 M\07DX^C9N7`-37<NM.ON#J2-:Q-@]R.7^:XI)*\;OH,'8#B=,AL[OE;;0L*I
@@ -12 +12 @@
 M4*;R+,@[S@0TD`;4P#J$G27[<JTF:*(V=VK"LHJ`*ARI?[A(%FV0+UDW]+L@
 M;/$BU"Y<Z<)5+ESA8E#W*MG7@0Y+=/PR"&9U6-!A3H<9'=2&%NJUH96,H4=C
-M0@LS1&4LS0S;;H(JX%28VIC/3Q_@IJF;]P>^O7E4QO>ZR9O7>JRZ^&[T&T8$
-&6PU0!@``
+M0@LS1&4L]0Q]>J96Y?/3![AIZN;]@6]O'I7QO6[RYK4>J_:]&_T&B.1?54D&
+"````
 `
 end

Tst/Short/elimlib_s.res.gz.uu

@@ -1 +1 @@
 begin 640 elimlib_s.res.gz
-M'XL(""(6M50``V5L:6UL:6)?<RYR97,`Q5AM;]LX#/[N7R$4]\&>Y326D^ZN
+M'XL("!TXG54``V5L:6UL:6)?<RYR97,`Q5AM;]LX#/[N7R$4]\&>Y326D^ZN
 M00I<]P(,V(9#6Z`'%%NA)$KK7AQGMIS8&>Z_'RG)+W'2).N]99@MD1))D7Q(
 MN=<W;S]\)H3X%^3CATMR(E/9F86CDX%U;3CL@@#Q/IR'TG8&%K[)Q041LS""

kernel/preimage.cc

@@ -85 +85 @@
 
   ring tmpR;
-  if (rSumInternal(theImageRing,sourcering,tmpR,FALSE,TRUE)!=1)
+  if (rSumInternal(theImageRing,sourcering,tmpR,FALSE,2)!=1)
   {
      WerrorS("error in rSumInternal");

libpolys/polys/monomials/ring.cc

@@ -716 +716 @@
  */
 /* vartest: test for variable/paramter names
-* dp_dp: for comm. rings: use block order dp + dp/ds/wp
+* dp_dp: 0:block ordering
+*        1:for comm. rings: use block order dp + dp/ds/wp
+*        2:order aa(..),dp
 */
 int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN vartest, BOOLEAN dp_dp)
@@ -889 +891 @@
   /* ordering *======================================================== */
   tmpR.OrdSgn=1;
-  if (dp_dp
+  if ((dp_dp==2)
+  && (r1->OrdSgn==1)
+  && (r2->OrdSgn==1)
+#ifdef HAVE_PLURAL
+      && !rIsPluralRing(r1) && !rIsPluralRing(r2)
+#endif
+     )
+  {
+    tmpR.order=(int*)omAlloc0(4*sizeof(int));
+    tmpR.block0=(int*)omAlloc0(4*sizeof(int));
+    tmpR.block1=(int*)omAlloc0(4*sizeof(int));
+    tmpR.wvhdl=(int**) omAlloc0(4*sizeof(int**));
+    // ----
+    tmpR.block0[0] = 1;
+    tmpR.block1[0] = rVar(r1)+rVar(r2);
+    tmpR.order[0] = ringorder_aa;
+    tmpR.wvhdl[0]=(int*)omAlloc0((rVar(r1)+rVar(r2) + 1)*sizeof(int));
+    for(int i=0;i<rVar(r1);i++) tmpR.wvhdl[0][i]=1;
+    // ----
+    tmpR.block0[1] = 1;
+    tmpR.block1[1] = rVar(r1)+rVar(r2);
+    tmpR.order[1] = ringorder_dp;
+    // ----
+    tmpR.order[2] = ringorder_C;
+  }
+  else if (dp_dp
 #ifdef HAVE_PLURAL
       && !rIsPluralRing(r1) && !rIsPluralRing(r2)
@@ -909 +936 @@
         || (r2->order[0]==ringorder_Wp)
         || (r2->order[0]==ringorder_Dp))
-     )
-     {
-       tmpR.order[1]=r2->order[0];
-       if (r2->wvhdl[0]!=NULL)
-         tmpR.wvhdl[1]=(int *)omMemDup(r2->wvhdl[0]);
-     }
-     else
+      )
+      {
+        tmpR.order[1]=r2->order[0];
+        if (r2->wvhdl[0]!=NULL)
+          tmpR.wvhdl[1]=(int *)omMemDup(r2->wvhdl[0]);
+      }
+      else
         tmpR.order[1]=ringorder_dp;
     }
@@ -1245 +1272 @@
     omFree((ADDRESS)perm2);
   }
-  if (Q1!=NULL) 
+  if (Q1!=NULL)
   {
     if ( Q2!=NULL)

libpolys/polys/monomials/ring.h

@@ -402 +402 @@
 
 int    rSum(ring r1, ring r2, ring &sum);
+/// returns -1 for not compatible, 1 for compatible (and sum)
+/// dp_dp:0: block ordering, 1: dp,dp, 2: aa(...),dp
+/// vartest: check for name conflicts
 int rSumInternal(ring r1, ring r2, ring &sum, BOOLEAN vartest, BOOLEAN dp_dp);