Changeset dabe36d in git

Timestamp:

Apr 24, 2015, 10:10:00 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

769a27f375c14dbe7cac70321db6bb76ef18fb07

Parents:

0e64419f9c8b5ac88636e5a328adeece695304d3

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-04-24 10:10:00+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2015-04-24 11:04:22+02:00

Message:

crypto::is_injective -> set_is_injective (conflict with algebra.lib)

Files:

• Singular/LIB/crypto.lib (modified) (6 diffs)
• Tst/Long/knapsack.res.gz.uu (modified) (1 diff)
• Tst/Long/knapsack.stat (modified) (1 diff)
• Tst/Long/knapsack.tst (modified) (1 diff)

Singular/LIB/crypto.lib

@@ -74 +74 @@
   injective_knapsack(int ksize, int kmaxelement)                        Creates all list of all injective knapsacks of given size ksize and maximal element kmaxelement
   calculate_max_sum(list a)                                  Calculates the maximal sum of a given knapsack a
-  is_injective(list a)                                    Checks if knapsack a is injective
+  set_is_injective(list a)                                    Checks if knapsack a is injective
   is_h_injective(list a, int h)                                Checks if knapsack a is h-injective
   is_fix_injective(list a)                                  Checks if knapsack a is fix-injective
@@ -3360 +3360 @@
   for(i=1;i<=size(list_of_lists);i++)
   {
-    if (is_injective(list_of_lists[i])==1)
+    if (set_is_injective(list_of_lists[i])==1)
     {
       output_list=insert(output_list,list_of_lists[i]);
@@ -3393 +3393 @@
 }
 
-proc is_injective(list a)
-"USAGE:   is_injective(a)
+proc set_is_injective(list a)
+"USAGE:   set_is_injective(a)
 RETURN:  1 if a is injective, 0 otherwise
-EXAMPLE: is_injective; shows an example;
+EXAMPLE: set_is_injective; shows an example;
 "
 {
@@ -3423 +3423 @@
   list inj = 1,5,7,41;
   list non_inj = 1,2,3,4;
-  is_injective(inj);
-  is_injective(non_inj);
+  set_is_injective(inj);
+  set_is_injective(non_inj);
 }
 
@@ -3554 +3554 @@
   int condition = 0;
   out = set_turn(out);
-  if (is_injective(out)==0)
+  if (set_is_injective(out)==0)
   {
     return(0);
@@ -3593 +3593 @@
   list a = three_elements(super_increasing,2);
   a;
-  is_injective(a);
+  set_is_injective(a);
 }
 /*

Tst/Long/knapsack.res.gz.uu

@@ -1 +1 @@
 begin 640 knapsack.res.gz
-M'XL("!?"-U4``VMN87!S86-K+G)E<P#-6EN/K#82?N]?08[RP.JP,]A`TYW1
-MS&JCS4.D["I2]B'2*.JXP3U-#@T=+B=S_OV6N;B,P=#,:)4H1QFPJ^ROJCZ7
-MR[A_^N^_OO^/95GDR?KA^V^M#U59W:7)\</#YJ>NASY9T'A(LJ2R__:P$7^M
-MIR?K4\:N)8L^W67\C[NR8I54\)XL^>S?B6$_1,67:Y5K`P=/%G]EEVO*K9)7
-MA[(^-G]X];"!WG]862[[3WFAR;0BO"B@)X^BNBAX;"69!:]'#N+<:J=)DXQ;
-MP3?6KX:I?I5PMD,X55UD9B"B=Q6$K0:A&1XG#X>3LSBN<I:F9@"]Q"H0H09"
-M3H-`=D,@49Z555%'(OY1P5F99"_S(3)IK`*ZTX`:82#P_1!XF@!G8Y[RBA_B
-M^IHF$:MX:88]+;\*]%X#;8`@(1-76P`\JI)\AG2=P"I0Q-6YW\V",,@01IW-
-M@FBZUT$@&H1V!@1`AP"2K.3%#,/:_G40J`:AFP,Q>$,,_/>:I3-T:?O78?`T
-M#-T<B,$?8EC!WO<1E_@:LCG2!J,$43'PYFQ":"360=)3MIP'D6@).RGG$U/;
-MOPZ%GK6[.1"#EK>/]?&8\C(O!,-FL`SEUF'2D[@V)V+;3=(I`MZ#(P_P=N%S
-M&*?EUV'5\[@!`V+6LOBE3JODFGYI<ZG@P"SD2?%UB/4D/HU``J8N%CN4W$E$
-M$4NC.H6E<\B+F!>P73UL[N^M:Y%'$WW6J<@O`.!H8:&T^>[G?_[[QQ^^^P;P
-M'Y,7"*UUR6-B/5J>]X!MUR*Y)%7RF4,'\96.K+X(X4`TC6>T1;<CE1TQ-!1W
-MWD8:HR1E8+V4/!1Y7J$MHZXE4T8*MN>$,#.9[*--GXNHE#1]2K+X<$H*"(L)
-MG5%D"643E`+<YSJO3GH5/C2.98>-X^8D@D#(4#1#R?3')&/%%U&*(6YL>P-0
-M0=1^A.89B.&X#A'_M?SH![<5*<#W3'X10UID\TSED]<^N9MG7SX%_9.T1]D4
-MDNPS+TI^`$;5:5TJ5!EVO,$R90T0KV\`(O<TUV80'.^)O4.LVQ&Q^8C/_"WH
-M.E6;N`UGE9:6X!)!J)$85NP+;XY8,7_5V#OHFT35C[K31IT:S3R*8EM#&M;0
-M)G"HZVP=+Y0KH!G!9M"NLKYOW4*CKS<2UQTNXCWF3,_%G-F?RNJ+2Q"WVGH3
-M\O,C<7PG=#PJ0*OJ]KF%[8[;"5$6@#NQ`(BR`$;:GC>Y?-R)Y8,T\-2Z&\>C
-MDZ;3]YE.#:;3=YE.WVRZLKG4V3&O@2GQH?^B@`X8][W!#4V3U(=4X6`SS')*
-MF@SI.C*C1.S*HJ3ZTJ>5,0J[?W#:`9Q>9=*3Z`M/^L*3672[>=YV_L$EXBG[
-M7%.!Q)!&LA*.32R=\)-1Y`UI[,*J(GFU+H`9_C59P(<E#.[<.1[L(7LGE.Z+
-M1#=U2`@"Z%-1HCC4:7QG1&9?G,BY+G!'88RR8V8LBEATYH>RXD5V>.$9+UA[
-M<NX=8A19<HA1T0;:[&FW@N:EU!6Q"W!!;7TTC(22"KZ/5@9&*WG6`)ZS$D66
-MK+R__S'EK(1)\HI;U9E5\#]N?69IS<NFFF[V+;&ULBRVSJR():/.#&K-(^=0
-M0!]%$<^[&D4,T&//3V87?257J3KJ(WC*`0]!-@H=W^^7HH3Q"+N&)REVX67)
-M7KBL;!KR&;UAJS,YG:[3#PW!VN_]`&.P-<8@YHLQ0)'WQ>"]7F[B9O3(5T;W
-M-B66]*YP3-_ZB<N$>%/XC(X9A@.&E:'H8[.8%7`_DE%3:JK+X<*+3RD_G'F:
-M7EAVJ`J6E<#JBY8E%@3_RJMH.;[ZMD<A>P=M[E;J:$J(NM;ZDV2S0RZX1]T$
-MM6/D.'J^A^'S*)8$WAY#N)L)X53ZFQ'Z"X1NP7M3(8*=%G98#S94;V_(=6Y[
-MAILQW=8SG3A[^,I*V<^X>2K#S0B]S\UO]J029Q&=-WA:7PSH8]\U?%RA2OMP
-M\<PXR+1&;LQT4[6SK]P:W)KGWI/EQB05KB-TN"]X>EYI&F[,'V(/T#*')[VQ
-MQ\01*'D#_4&,_IA,&O^?E'$SEV]BZG!O]:#F)N#RJ?JGJ7ZZG&#,"%/UC_@>
-MA1^D?&ITXF1*^),3@G'Z)AV\U\53K)8.I_06IINJ'3&NTV@ZEI*>@]GS]V06
-M4.^KZBLOU(O1\0'1*+(4,*-B^Y6KAQT0*H'38(M+ENXD>''\Z<Z\H@+H#[T@
-M''9GI<WSKJL6-L_[;C"8PAT9KQP&S_.&3W8O&3VI!`8[P62^IM)<7QJ[D[82
-M/.`+LSM;MYXTEE#%7#@,2H/]'>[:_N`+ZV_B#O<SG[!WW+?X07ZD8<-J4`SM
-M_S:Y6+Q3^4Z:=T^^8]9>H82GXA5*N!6L4-K*H*Q0"F7X9I2HID1DH%<H(256
-M*"%W5B@%2+(56N`^LLP);PR0+)-"UQ((EUFA:T&LR#(M_`F[EGFA:XFYEHD1
-M3,RUS`Q=2\RU3(WMA-8R-W::EDCDR]S0M<3*7^:&K@7<H,O<T+7$)[5E;NA:
-MX'FZS`U=*\0,K'P7POO4"WL5G\*G+G>[KE6W+>*[:5M:C\:QF2C9E+HW'-QC
-MR30^N,N2K3>A`.D.1^CX1%:;69X=^BYQ</*[VRXYN`U/>(6+S9WBX/+'WPU@
-MGPW`SRNAGQ6$S>=J$G8HE9'LYMGQ.JSW]^0C_>A_).XC"4W"_A#]?H#^E+P:
-M\`]ZEJOBZIR4H&:!VM]1[<@C5I?B)Q^/Q&VA6G\DU=F*D].)%[R]_3SRHA15
-M,8MCGI5WO4<Z!&.?X&Q97AEFA)D>Z4?O#BE0'88#(@T&IMK=&])AV*T,-'!L
-MH)QJJW/!>?_;$.4">=C^ISA5+X=5[U*\`A'+>8C6UC4=<9=@64PI*`.ZQ^J?
-M^*&LB\(M%I8DP*LC(@X.VUY&EAS4Q=K2E>6!4EA2W,A':Y8-KJH#@E>U`;UK
-6?@@L?NM;ES:<UK_>_`]G%0<S/BP`````
+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
+:MQ&^XS\.9K__;6L73O!?;_X'3LS@%%(L````
 `
 end

Tst/Long/knapsack.stat

@@ -1 @@
-1 >> tst_memory_0 :: 1429717527:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:237704
-1 >> tst_memory_1 :: 1429717527:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2269184
-1 >> tst_memory_2 :: 1429717527:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2834432
-1 >> tst_timer_1 :: 1429717527:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:1462
+1 >> tst_memory_0 :: 1429866220:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:237728
+1 >> tst_memory_1 :: 1429866220:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2269184
+1 >> tst_memory_2 :: 1429866220:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:2834432
+1 >> tst_timer_1 :: 1429866220:4020, 64 bit:4.0.2:x86_64-Linux:nepomuck:1474

Tst/Long/knapsack.tst

@@ -45 +45 @@
 example injective_knapsack;
 example calculate_max_sum;
-example is_injective;
+example set_is_injective;
 example is_h_injective;
 example is_fix_injective;