Changeset efb096 in git

Timestamp:

Mar 18, 2015, 3:36:09 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c31c5835bece938cfe0770b54facad06a4501985

Parents:

f3f0ada0fecda59e7576f7bbec2608a0729a6aad

Message:

fix tr. #703 (degree/ecart for ws-ord with diff. signs)

Files:

• Tst/Short/bug_tr703.res.gz.uu (added)
• Tst/Short/bug_tr703.stat (added)
• Tst/Short/bug_tr703.tst (added)
• Tst/Short/spcurve.res.gz.uu (modified) (1 diff)
• kernel/GBEngine/kutil.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Tst/Short/spcurve.res.gz.uu

@@ -1 @@
-begin 644 spcurve.res.gz
-M'XL(""4>OU```W-P8W5R=F4N<F5S`-U82V_;.!"^ZU<,@CWX0;<2)5N)#0?H
-M9GLHTA0%$J`+!'&AV&PBU)9<24XD+?:_[PPI/NRT2(O-8;$.('(>''XS''(&
-MN;SZX]T'``A.X?V[W^&H*JM7Z_3V:.9==A)^"LC\G&9IU>O//!KA]!3*[7)7
-M/(A7F7A\559)9?3#SI)6V+<6G8*HD\UV+2`MSRZ6^8K/O->O85OD2\.!+T6^
-M`5P(CA'O[9]O+CZ^?SOU`(HTNX-B'G+?#UFO9@UK^VQ5SE"4KD2RAG1>MZQI
-M6;T(1\TB(L$6%U4]O44O[:,SHX:-:LZ\FD$3,O!\!BV"]`S<L85[=E$U6V'!
-M*OI%H#9,HB6>LHKH9AZW,"86QB:IBK2^"BP0S?E5*+V@S^H>IT_8W\<DE\])
-M8]!IR%FH%L@9*:N=X6)NHBH7.K*KH'?!2/DZN"$(\/DZ8,'-W-=S?C,?D3E%
-M<Y*-:`]-H]R2(8D)BR8Y6;KFQO3-_$YDO;%>K<BH/Z)![Q'B#D1KHY$R.5`K
-MY>8#5W_LR">./.KD$X6P6R.=D7.-,G;DD2/7^Q]W$=ACGCB+N+.I-AKX#BK#
-M#%Q3&E_`#P$<.!B$CBW#C%Q;$\T=.[;<8.B0!Y.]:-H,CFT&EV*3'MY\R_MO
-M9?$Z+2M8SP^2&6`EOD"1B=W<`N^M,?]86:UPPF_Z4JT4E8*+JHK>I#./OI2K
-M;PC%&Y4T=M:A55J<M`(E&QK\2A9V5V5`&NJLR.+0.&>C?VRCOTK+96$#+\G_
-M=<REASU:(^U\5I$/5+!D8&V<3FR<OMTK`#94FO.ST?(/GGOM,QX<G6O+?)36
-M5*)80W)MOW?AO)?X0K+`/'$!KJ$1>7+$%Q"HM.%"N:IE`%C#O`9'K&E>C46M
-M,>X%OG6O$.M'D=[=5]8_P_HW-:US\@,BI@1]XB368%2!3YT<BX'^ZZ0/8@G)
-MW'`,J-X']HDE>V4Q"*P_V[P\],>P7CR]>[6^JHLNI]DABRL3"ZYX\<MDOG'I
-M(/&9_]W4EWE!:U`9%:[4ZX"I?T4N@GPSA@HS)HLD,7'T3SIA*&^?!.@<HVUH
-M!WXS\[`^V\/!OK$[SL>D6MY_+/*[0I0E7@MSX%HUM.=X?KD5V5(4YP*=6-O#
-MW.>_U!4<U8N8,A3]IU[Q1.6H"??^IG@<1TEQA(%49U#",B_0I6V>K6B[*H?J
-M7H#(<`]10OY%DFK+J;G0&*,)X_9*<XR$NM0A=COJ6O,8E<!;BT09%L5&F[LK
-M<G&;B0)NDS(MH?=MA^-]OLFQX(I\AYB24O2]3:Z;H4`2Z"QO=(%'FDI^[-!8
-M[5N''!OQ6-)8U1O=5"")+4U<3QP&]C!QZ]#8OO":MXX%:E@:W4L0'1`B[FIP
-MLVFG$FI0'1UI$US1%F7'F.@%'4VM5[.'`H'RUNR:Y0)C6GA69RN*:E?<BI5.
-ME21;@3[N[@@ZG:1*\ZR<'G:VE%+#UFEOZT6$]XTNVF(\4%=P,9$WT.EY,0.=
-MCK=UV]W%R9!,-+@D5D9H.E%F:#KN#YM!BY/([8N;;IOCODFU8S:F:N*SF$5X
-M`;E'.5,D55X8W[ZJZY64D,#9]=7-7_7?L,E7N[68>IOJ6G;N.*)]@?L.'&!\
-M(&2!U]X2/2%:@1A&@VZ%P3_6*[JPQ%K#N'6L-52\AH&O5(R[""7LH"A>;`YU
-MZFFV1^SNY?+M"_9T^L/!*T2UWLB38A/IGI2%`V/Y)RW0B3(]Y78:&KN=S>]8
-M0.?)9^(<=P\X]=4R4G*JPL@B&5W&9=CE@&9E9)X6"'Q$!#'D.PNPO$^*9(G/
-M#=:A=`E3\!4_VVUN\<G!''E(,%>F$,1*('^WZWSYE9H3%.3%2AJ$3Z6C87]3
-MR)(-/H[X$^@"T/GB)Z1/1)\Q?29]J*&!]@<F]'V$$0]@%/@P"KF:\QCI"82`
-M'WQCGV+D+L;'[7,8*<Q`406*(E#\@>(-%&*@H(*\8<_@I".3)P02`G5B\NSH
-M$X$,'0F^@S=T\9Z9_V*<7\IRKI+//\CM9W/Q_'(_E74>_\Q"F<%RY-WX*[FK
-?$U=G[;,I:UJ$2/T7BO[3M"O1QNPW[Q^A"\CONQ(`````
+begin 640 spcurve.res.gz
+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
+<SZ:L[0]2]2\H^C?3MD(;D]^"?P"0H8@XN!(`````
 `
 end

kernel/GBEngine/kutil.cc

@@ -8117 +8117 @@
 BOOLEAN newHEdge(kStrategy strat)
 {
+  if (currRing->pLexOrder || rHasMixedOrdering(currRing))
+    return FALSE;
   int i,j;
   poly newNoether;

libpolys/polys/monomials/ring.cc

@@ -3173 +3173 @@
       r->pFDeg = p_Totaldegree;
     }
-    if ((order[0] == ringorder_a)
+    else if ((order[0] == ringorder_a)
     || (order[0] == ringorder_wp)
-    || (order[0] == ringorder_Wp)
-    || (order[0] == ringorder_ws)
+    || (order[0] == ringorder_Wp))
+    {
+      r->pFDeg = p_WFirstTotalDegree;
+    }
+    else if ((order[0] == ringorder_ws)
     || (order[0] == ringorder_Ws))
-      r->pFDeg = p_WFirstTotalDegree;
+    {
+      for(int ii=block0[0];ii<=block1[0];ii++)
+      {
+        if (wvhdl[0][ii-1]<0) { r->MixedOrder=2;break;}
+      }
+      if (r->MixedOrder==0)
+        r->pFDeg = p_WFirstTotalDegree;
+      else
+        r->pFDeg = p_Totaldegree;
+    }
     r->firstBlockEnds=block1[0];
     r->firstwv = wvhdl[0];
@@ -3206 +3218 @@
     if ((order[1] == ringorder_a)
     || (order[1] == ringorder_wp)
-    || (order[1] == ringorder_Wp)
-    || (order[1] == ringorder_ws)
+    || (order[1] == ringorder_Wp))
+      r->pFDeg = p_WFirstTotalDegree;
+    else if ((order[1] == ringorder_ws)
     || (order[1] == ringorder_Ws))
-      r->pFDeg = p_WFirstTotalDegree;
+    {
+      for(int ii=block0[1];ii<=block1[1];ii++)
+        if (wvhdl[1][ii-1]<0) { r->MixedOrder=2;break;}
+      if (r->MixedOrder==FALSE)
+        r->pFDeg = p_WFirstTotalDegree;
+      else
+        r->pFDeg = p_Totaldegree;
+    }
   }
   /*------- more than one block ----------------------*/
@@ -3246 +3266 @@
 
   if (rOrd_is_Totaldegree_Ordering(r) || rOrd_is_WeightedDegree_Ordering(r))
-    r->pFDeg = p_Deg;
+  {
+    if(r->MixedOrder==FALSE)
+      r->pFDeg = p_Deg;
+    else
+      r->pFDeg = p_Totaldegree;
+  }
 
   if( rGetISPos(0, r) != -1 ) // Are there Schreyer induced blocks?

libpolys/polys/monomials/ring.h

@@ -741 +741 @@
 inline BOOLEAN rHasGlobalOrdering(const ring r){ return (r->OrdSgn==1); }
 inline BOOLEAN rHasLocalOrMixedOrdering(const ring r){ return (r->OrdSgn==-1); }
-inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder==1); }
+inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder); }
 
 // #define rHasGlobalOrdering(R) ((R)->OrdSgn==1)