Changeset 78d776 in git for Singular/LIB/tropical.lib
 Timestamp:
 Mar 19, 2014, 9:01:55 PM (10 years ago)
 Branches:
 (u'spielwiese', 'a719bcf0b8dbc648b128303a49777a094b57592c')
 Children:
 35f51c1498caac698f88edaebe09d65cb380aec7
 Parents:
 706597eca3628b2f2f0d581d93c41b9e6ac6f466b4ccb21068b8fec038ce45006522ec978dbf8324
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

Singular/LIB/tropical.lib
r706597e r78d776 531 531 // to start all over again; 532 532 // this is controlled by the whileloop 533 intvec ordnungskontrollvektor=N,w[2]; // used with the option puiseux 533 534 while (size(liftrings)==0) 534 535 { … … 540 541 else // use absolute primary decomposition 541 542 { 542 list TP=tropicalparametrise(i,w,ordnung, gfanold,findall,nogfan,puiseux,ini);543 list TP=tropicalparametrise(i,w,ordnung,ordnungskontrollvektor,gfanold,findall,nogfan,puiseux,ini); 543 544 } 544 545 // compute the liftrings by resubstitution … … 731 732 w=precutdownw; 732 733 */ 733 ~ 734 734 735 } 735 736 } … … 741 742 } 742 743 /////////////////////////////////////////////////////////// 743 if ( voice+printlevel>=2)744 if (printlevelvoice+2>=0) 744 745 { 745 746 … … 777 778 { 778 779 "EXAMPLE:"; 780 int oldprintlevel=printlevel; 781 printlevel=1; 779 782 echo=2; 780 783 //////////////////////////////////////////////////////// … … 823 826 setring R; 824 827 displayTropicalLifting(LIST,"subst"); 828 printlevel=oldprintlevel; 825 829 } 826 830 … … 966 970 RETURN: list, where each entry of the list l describes the NewtonPuiseux 967 971 @* parametrisations of one branch of the plane curve singularity 968 @* at the origin defined by f; only the first n termsof each972 @* at the origin defined by f; only the terms up to order n of each 969 973 @* parametetrisation are computed 970 974 @* l[i][1] = is a ring … … 979 983 the new base field will have a parameter and a new minimal polynomial, 980 984 and LIFT[2] describes how the old parameter can be computed from the new one 985 @*  if a field extension with minimal polynomial of degree k was necessary, 986 then to the one extension produced acutally k extensions correspond by replacing 987 the parameter a successively by all zeros of the minimal polynomial 981 988 @*  if the option subst was set l[i][3] contains the polynomial where 982 989 y has been substituted by y(t^{1/N}) as a string … … 1155 1162 "EXAMPLE:"; 1156 1163 echo=2; 1164 printlevel=1; 1157 1165 ring r=0,(x,y),ds; 1158 1166 poly f=x2y4+x5y7; … … 4678 4686 "AND HIT THE RETURN BUTTON TWICE (!!!)  NOTE, THE LAST 0 IS OMITTED"; 4679 4687 "IF YOU WANT wneu TO BE TESTED, THEN SET goon=0;"; 4680 ~ 4688 4681 4689 // THIS IS NOT NECESSARY !!!! IF WE COMPUTE NOT ONLY THE 4682 4690 // TROPICAL PREVARIETY … … 4687 4695 { 4688 4696 "CHOOSE A DIFFERENT RAY"; 4689 ~ 4697 4690 4698 } 4691 4699 else … … 4724 4732 { 4725 4733 "Set intvec wneu!"; 4726 ~ 4734 4727 4735 } 4728 4736 } … … 5548 5556 /////////////////////////////////////////////////////////////////////////////// 5549 5557 5550 static proc tropicalparametrise (ideal i,intvec ww,int ordnung,int gfanold,int findall,int nogfan,int puiseux,list #)5558 static proc tropicalparametrise (ideal i,intvec ww,int ordnung,intvec ordnungskontrollvektor,int gfanold,int findall,int nogfan,int puiseux,list #) 5551 5559 "USAGE: tropicalparametrise(i,tw,ord,gf,fa,ng,pu[,#]); i ideal, tw intvec, ord int, gf,fa,ng,pu int, # opt. list 5552 5560 ASSUME:  i is an ideal in Q[t,x_1,...,x_n,@a], tw=(w_0,w_1,...,w_n,0) … … 5620 5628 list wneulist; // carries all newly computed weight vector 5621 5629 intvec wneu; // carries the newly computed weight vector 5630 intvec okvneu; // carries the newly computed ordnungskontrollvektor 5622 5631 int tweight; // carries the weight of t 5623 5632 list PARALIST; // carries the result when tropicalparametrise … … 5722 5731 "AND HIT THE RETURN BUTTON  NOTE, THE LAST 0 IS OMITTED"; 5723 5732 "IF YOU WANT wneu TO BE TESTED, THEN SET goon=0;"; 5724 ~ 5733 5725 5734 // THIS IS NOT NECESSARY !!!! IF WE COMPUTE NOT ONLY 5726 5735 // THE TROPICAL PREVARIETY … … 5731 5740 { 5732 5741 "CHOOSE A DIFFERENT RAY"; 5733 ~ 5742 5734 5743 } 5735 5744 else … … 5793 5802 { 5794 5803 "Set wneulist!"; 5795 ~ 5804 5796 5805 } 5797 5806 else 5798 5807 { 5799 5808 "Set intvec wneu!"; 5800 ~ 5809 5801 5810 wneulist[1]=wneu; 5802 5811 } … … 5810 5819 // if all variables were deleted, then i=0 and thus anzahlvariablen==0 5811 5820 lll=0; 5812 if (( ordnung>1) and (anzahlvariablen>1))5821 if (((puiseux==0) and (ordnung>1)) or ((puiseux==1) and (ordnungskontrollvektor[2]<ordnungskontrollvektor[1]*ordnung)) and (anzahlvariablen>1)) 5813 5822 { 5814 5823 partliftings=list(); // initialise partliftings … … 5822 5831 { 5823 5832 wneu=wneulist[kk]; 5824 PARALIST=tropicalparametrise(i,wneu,ordnung1,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero); 5833 okvneu=ordnungskontrollvektor[1]*wneu[1],ordnungskontrollvektor[2]*wneu[1]wneu[2]; 5834 if (puiseux==0) 5835 { 5836 PARALIST=tropicalparametrise(i,wneu,ordnung1,okvneu,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero); 5837 } 5838 else 5839 { 5840 PARALIST=tropicalparametrise(i,wneu,ordnung,okvneu,gfanold,findall,nogfan,puiseux,anzahlvariablen,zero); 5841 } 5825 5842 // the output will be a ring, in which the 5826 5843 // parametrisation lives, and a string, which contains
Note: See TracChangeset
for help on using the changeset viewer.