Changeset 3b2cf5 in git

Timestamp:

May 9, 2014, 4:02:04 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

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

Children:

ea83e226c7aa5ab2df0c58dd6a9031153a7a981c

Parents:

082428606ab86c928fbf217217338a788f266009

git-author:

Martin Lee <martinlee84@web.de>2014-05-09 16:02:04+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-05-12 14:35:03+02:00

Message:

chg: Branches_of_space_curve_singularities due to changed order in
primdecSY

Files:

• Tst/Manual/Branches_of_space_curve_singularities.res.gz.uu (modified) (1 diff)
• Tst/Manual/Branches_of_space_curve_singularities.stat (modified) (1 diff)
• Tst/Manual/Branches_of_space_curve_singularities.tst (modified) (2 diffs)
• doc/examples.doc (modified) (previous)

Tst/Manual/Branches_of_space_curve_singularities.res.gz.uu

@@ -1 @@
-begin 640 Branches_of_space_curve_singularities.res.gz
-M'XL(",HG<DX``T)R86YC:&5S7V]F7W-P86-E7V-U<G9E7W-I;F=U;&%R:71I
-M97,N<F5S`,586W/KMA%^UZ]`,YV)98DZ)BCY6IV'DTR2,Y.D'=LO2<;R0"1D
-MH8<D%(*T1?[Z[BXNI&2==CI]J!],<G?Q`=C[ZN'Q^\^_,L;BC^SGSY_8-[6I
-M9[E:?W/'X.U9E:H^&]^-\,D^?F2?*E&F6VF>]>;9[$0JG].F>I7/1I4O32XJ
-M52MI9J5\FYE:U*,'!\X_PK\*9%BUO)B>[:?MM!M/,W,7)!*44)D4.5/+_6H>
-MM>?=BD_WYVW4K9)IN^+1?I6<=W>,??C`ZJUDM#VC[5F_?1L0YXCXY_9-JI=M
-M?:;@$O&43^/`7R`?L!X!ZT6]RO)KB$P9]F<CC-KJ0K_(4NK&S-A/L@3A-Y`7
-M)=L)8P+PY<P"UYK.N=-Y6^I"P<U0`[,@=S4+2CG0RJ[7RO50*ZH0N[-JBC?Q
-M_!O2JS0Z;VJE2Z;@?5G`OS,UO>CEX@O"`?K="+Z8_4O<D[OGJ*K8WZ((`,-S
-M-+IPS/A8.&#'3H\_5+JPAJFK)JV;2C*](4)_P"DJS$@)9%$3[SN]E67TBT@%
-M:#L8+^9>A^TNP#@C'1J&AR6)71*^YP[B9UFSQK!2O[%<ZR]LHRN"6SM7!B;:
-M@$Q5J2*3*0/_KT35!E/%"\2B\'`B-D0"_Q)UX%@/OY&S_1$_W8*RF7_"WS.\
-M+_=1%S[YT[+C44MB_#^+>9ECR"Z)]NU0>I],]KR;[#L^V;>3MD=*@,>1REO@
-M=,#BDY:?VO]_QO2JN4+59'(#2ETB4*^TH7/S9:Z0Z;P+S):*/+?N)%-=9D$P
-M++\9Q*^+62D+@V&W%?#%>PNO6_:&#H?1JHM=4\NLM[H'Y!?.843^HL&]M@4Z
-MWL-6%;H5A8A^TU_H)7@%C]V"7\&UZ*2B\!L("D?8%^D_*E&6*GJLQ(NLHM]%
-MN@7W%:;?Z#9`DM\[1_KQ\?=_ZTD1*OK`1-9GCDUY4NZKOG0-!KP$`W;S29O@
-MROG!TFXQ039RT>AM,O2#J`,GZ;>:>\\@\M#;B+TX[53O//'_>R)OF<2YVT_B
-M%1TG^)'/&Y`OP,V1K(VRR;@$'\S49B,K68+SB19,7F8!T2>HK474ZUJHTB&2
-M*Y5-L985>J'W9,J?!18T)O<[F=8AD0;4A4-]OQC3905!E+>,3]FZJ7WU`F;Z
-M!4`410KDQP(2;(_HZYE/G*I\1?\M:X/HIXLF=`&]4U\=9F9^[0"+ABU9+1H6
-ML9I-H,2<X1;'I?84]CA@W3BLMRUH&1$S6>H:+HLG_47E)2!:54QI*R0__K.!
-MLBN\B@8V27P..%6<J!@%R?CP4@D?7@KL+O-:P,4JO%@02@Y.:V6&!R9*]-DK
-M&(_&K-+?FS.`SH].XCT`KXOF70^R'MBW+W>IKJ`T[R"[(F57Z51F6+8?8[:!
-M8AX`O0/@0BQ\(0,F9%DC:]O%A-2>4&JG>NG7],4RH<3]^!Q3<@/83!7X"6J+
-MDQ&%/%C^['(\X=TYOBW&(XIT?)^/)\F>$YDC.;'D9#S!1XPDC'&W#II(*QE9
-M).(O/#\&\@#J\FG9NG6X1]=SKCSG$.CZ:<G;(R0ZZPW6Z_XSO@C?M"[&\I[T
-M\#&W66E`P9K:#47@4MW<?SM%SJFK"]KOU3_W+9GM4=$/(+3CA-RI1M>#.*-@
-M03(X[J>&_!U25HTDA3G,J'5N^[0`&YJR[6%_O(5:5K_I098";NHWD-BUX<[6
-MW14FP0#I`T*5M83B^)?`\,GQ04-B?%60!_*6LE^F,NCEZI!KK7/GLI9Y"S>1
-M$*M&TA$WJC*U.U3`]<$!QS"%UO5VRG29M^\[#1<Y2-<E-/I;E6X],>P=$L<\
-M),FF0@V'$)E?O6]#81<#F[C`AG0K<M79CH%:73S;8=/3PUV'3M0N/(RM.<66
-MY9PI#O&%`?:M)7S+4DC_F`4$-&.F!C-!4@/>E+8%`\I<%E"JS`Q7/6K7J4N2
-MMMG/5DI88Y'/\14BEJQJQ0`JIJGFS(P]CDA3:6R&4U&]M4./7?F'>II29X^^
-M!RD9ZIX]U[V:6G\-VV(3>8]IPJV,H5WTWG\?WR%997?V]CO*+#^XBJ71)+2K
-ML1.%=8TS!8!X=+(#5EPX?*N;BJT%^!#*C^W681N"=6%4HB%K53:200!@Z;J/
-MZ<;WZ@.=Q4.+S08*.[9[$KS1CS/O#'__X1_/RI8&1,$/-5`:N5R)G03(BJ->
-MPV&J$M*\]YK,G]5JY,2F2,5,#UJ`KMD?>S8P+7]G6@)'VY)'I\H'22Y``DMV
-M)6I=(8(_$YW&@H&U9]BPE^ZT$/05QEJNC9L7K1*400"'A@YKV'UDFG6ALR8/
-M`V&M:S=4(V53B11OA4T,KHX_P.'.!QN?:J1!CC'LQV&MK."2*F6W[&)$]+[F
-M0CTV0+^T=/I;YQJ:)AR,;YFN()KQ&-EN(-'_W9)W&7Q]A!H`_SC^2\8G\/A_
-MA[=G+>M.P"1#F.^^VNX?S@5'0]VP;>["X+6X\!-=5>KELXO$P(T/BE*I>PYW
-MN0F"=$0/&DY0%^?0<#L2'`-5=(XSBJ4D2.%(08V=>_+<"783AT#<O7UT$R^V
-M\%NTDV[%'?'2KUWA6&UI5VX;I!&&9UP[X7;B<.P.*VY?8$AP@C=6D!CQF*1)
-M9!+[ZUXX*&1%@1K;G=V^GLJ#;#*F&WB&UP=!?VTGTDYB,>.P%)31K6"P#W>+
-M01/[%8P\*XXVH%OM\4I!S?$52G#+@6>+?)"EG^<F[:IWBV0PC[L,9`8A#)VG
-M&/X6!M,1UE7J=-<VIC/(!E!QYK;8!F#?"FP@1C7$85_O,8-HD.]A:22A%$]*
-MZ8?UA2_\[F<J96>I+R7-[N['*)]*WF=*EX@S5>'091K\;2!`^]H_/_ZMSQS?
-MLC^.;PMLBX8U!]3]`E-)[N8=:JJ@F4)]A`ENES>8C6WG@L@!S\]4MD]YPVH#
-MQ3[#F1026T&#)9C@Y*3:G\I/4W^'\VSH,#`@-'GM[F\;QUNV""<*2R]A<L(?
-4C/%GW\:`S]W]=?0OXY+%`5L6````
+begin 644 Branches_of_space_curve_singularities.res.gz
+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
+5?Q?CG[Z-!I^[^_OHWV0\F-A9%@``
 `
 end

Tst/Manual/Branches_of_space_curve_singularities.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:406444
-1 >> tst_memory_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:913408
-1 >> tst_memory_2 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:971112
-1 >> tst_timer_1 :: 1316104113:3132- exportiert :3-1-3:ix86-Linux:mamawutz:44
+1 >> tst_memory_0 :: 1399897935:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:411768
+1 >> tst_memory_1 :: 1399897935:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2490368
+1 >> tst_memory_2 :: 1399897935:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:2546268
+1 >> tst_timer_1 :: 1399897935:4.0.0, 32 bit:4.0.0:i686-Linux:mamawutz:43

Tst/Manual/Branches_of_space_curve_singularities.tst

@@ -15 +15 @@
   LIB "primdec.lib";
   primdecSY(i);
-  def li=_[2];
-  ideal i2=li[2];       // call the second ideal i2
+  def li=_[1];
+  ideal i1=li[2];       // call the first ideal i1
   // The curve seems to have 2 branches by what we computed using the
   // algorithm of Shimoyama-Yokoyama.
@@ -42 +42 @@
   // the singularity has two branches, since mu is even and delta is an
   // integer!
-  // So obviously, we did not decompose completely. Because the first branch
-  // is smooth, only the second ideal can be the one which can be decomposed
+  // So obviously, we did not decompose completely. Because the second branch
+  // is smooth, only the first ideal can be the one which can be decomposed
   // further.
-  // Let us now consider the normalization of this second ideal i2.
+  // Let us now consider the normalization of this first ideal i1.
   LIB "normal.lib";
-  normal(i2);
+  normal(i1);
   def rno=_[1][1];
   setring rno;