Mercurial > repos > siwaa > grum

changeset 2:21c154989717 draft default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"planemo upload for repository https://forgemia.inra.fr/grum/grum/-/tree/master/siwaa_recipe/galaxy_tools commit b956f127cf3e2e20dda2bb2b93ce8925eea589ef"
author siwaa
date Wed, 10 Aug 2022 12:30:47 +0000
parents 9c1c1c7f0e48
children
files test-data/inputs/BW_test.csv test-data/inputs/Litter_test.csv test-data/inputs/singlegoat_BW_test.csv test-data/inputs/singlegoat_Litter_test.csv tools_grum.xml
diffstat 5 files changed, 337 insertions(+), 338 deletions(-) [+]
line wrap: on
line diff
--- a/test-data/inputs/BW_test.csv	Fri Jan 21 08:35:16 2022 +0000
+++ b/test-data/inputs/BW_test.csv	Wed Aug 10 12:30:47 2022 +0000
@@ -1,218 +1,218 @@
-"id";"age";"bw_rec"
-2004029;0;5440
-2004029;24;9080
-2004029;31;10610
-2004029;38;11550
-2004029;45;12660
-2004029;52;14310
-2004029;66;13910
-2004029;73;14630
-2004029;81;15010
-2004029;87;15780
-2004029;94;16020
-2004029;101;17960
-2004029;108;20340
-2004029;115;19860
-2004029;123;21370
-2004029;129;23030
-2004029;136;23260
-2004029;143;24510
-2004029;150;26700
-2004029;158;27100
-2004029;164;28330
-2004029;165;28300
-2004029;171;27800
-2004029;178;31170
-2004029;185;30770
-2004029;192;31910
-2004029;199;31980
-2004029;206;33830
-2004029;220;34170
-2004029;227;39020
-2004029;237;37010
-2004029;241;36660
-2004029;248;37150
-2004029;255;38140
-2004029;262;36450
-2004029;269;39020
-2004029;276;37220
-2004029;283;39900
-2004029;290;41230
-2004029;297;40680
-2004029;304;40530
-2004029;311;41460
-2004029;318;42150
-2004029;325;42370
-2004029;331;45380
-2004029;339;46430
-2004029;346;46680
-2004029;353;47250
-2004029;360;49430
-2004029;367;51030
-2004029;374;52310
-2004029;381;56000
-2004029;388;58170
-2004029;395;58690
-2004029;402;61580
-2004029;409;65430
-2004029;416;68260
-2004029;424;69470
-2004029;428;57520
-2004029;437;56200
-2004029;444;54980
-2004029;451;53930
-2004029;458;54290
-2004029;465;54260
-2004029;473;53590
-2004029;479;51830
-2004029;486;51620
-2004029;493;52200
-2004029;500;54080
-2004029;507;52600
-2004029;514;51720
-2004029;521;52480
-2004029;528;51530
-2004029;535;53250
-2004029;542;52460
-2004029;549;54200
-2004029;556;53390
-2004029;563;56620
-2004029;570;55920
-2004029;577;55570
-2004029;584;56340
-2004029;591;55810
-2004029;597;57990
-2004029;605;55970
-2004029;612;57230
-2004029;618;55270
-2004029;626;59190
-2004029;633;59430
-2004029;640;59750
-2004029;648;58880
-2004029;654;59800
-2004029;662;65330
-2004029;667;64500
-2004029;675;61380
-2004029;682;67210
-2004029;689;67040
-2004029;695;68300
-2004029;703;73800
-2004029;710;76690
-2004029;717;79660
-2004029;724;81880
-2004029;731;86380
-2004029;733;86250
-2004029;734;64490
-2004029;738;65250
-2004029;745;60790
-2004029;752;52910
-2004029;759;57200
-2005115;0;4066
-2005115;6;3714
-2005115;13;5410
-2005115;20;6330
-2005115;27;7320
-2005115;34;9430
-2005115;41;10530
-2005115;49;11760
-2005115;56;12910
-2005115;62;14650
-2005115;69;15430
-2005115;76;16240
-2005115;83;17710
-2005115;90;18350
-2005115;97;19400
-2005115;104;20350
-2005115;111;20890
-2005115;118;22080
-2005115;125;23830
-2005115;132;25020
-2005115;139;25490
-2005115;146;27520
-2005115;153;28980
-2005115;160;30130
-2005115;167;28180
-2005115;174;28610
-2005115;181;31560
-2005115;188;31750
-2005115;195;32960
-2005115;202;32950
-2005115;209;35690
-2005115;216;35860
-2005115;222;36570
-2005115;230;37420
-2005115;237;38890
-2005115;243;39790
-2005115;251;40170
-2005115;258;39110
-2005115;265;39180
-2005115;273;40460
-2005115;279;39770
-2005115;287;41520
-2005115;292;42010
-2005115;300;43490
-2005115;307;45420
-2005115;314;47560
-2005115;320;48060
-2005115;328;49030
-2005115;335;50750
-2005115;342;51660
-2005115;349;54870
-2005115;356;57180
-2005115;363;59920
-2005115;370;59990
-2005115;377;62660
-2005115;383;62660
-2005115;384;54790
-2005115;391;50570
-2005115;398;51080
-2005115;405;51600
-2005115;412;52170
-2005115;419;53620
-2005115;425;54560
-2005115;433;53580
-2005115;440;54720
-2005115;447;54710
-2005115;454;55800
-2005115;461;55230
-2005115;468;55720
-2005115;475;54890
-2005115;482;58130
-2005115;489;56410
-2005115;496;57030
-2005115;503;56830
-2005115;510;58520
-2005115;517;56750
-2005115;524;56960
-2005115;530;55010
-2005115;538;55260
-2005115;545;56590
-2005115;552;54600
-2005115;559;56210
-2005115;566;56960
-2005115;572;59260
-2005115;580;57780
-2005115;587;57990
-2005115;593;58430
-2005115;600;59430
-2005115;607;59670
-2005115;614;58680
-2005115;622;57650
-2005115;629;59520
-2005115;635;62390
-2005115;643;62090
-2005115;650;63170
-2005115;657;64770
-2005115;664;64620
-2005115;671;65440
-2005115;678;66820
-2005115;685;68630
-2005115;692;68610
-2005115;698;70750
-2005115;706;73700
-2005115;713;76200
-2005115;720;80190
-2005115;727;80010
-2005115;733;65680
-2005115;741;64090
-2005115;748;62530
+"id","age","bw_rec"
+"2004029",0,5440.00
+"2004029",24,9080.00
+"2004029",31,10610.00
+"2004029",38,11550.00
+"2004029",45,12660.00
+"2004029",52,14310.00
+"2004029",66,13910.00
+"2004029",73,14630.00
+"2004029",81,15010.00
+"2004029",87,15780.00
+"2004029",94,16020.00
+"2004029",101,17960.00
+"2004029",108,20340.00
+"2004029",115,19860.00
+"2004029",123,21370.00
+"2004029",129,23030.00
+"2004029",136,23260.00
+"2004029",143,24510.00
+"2004029",150,26700.00
+"2004029",158,27100.00
+"2004029",164,28330.00
+"2004029",165,28300.00
+"2004029",171,27800.00
+"2004029",178,31170.00
+"2004029",185,30770.00
+"2004029",192,31910.00
+"2004029",199,31980.00
+"2004029",206,33830.00
+"2004029",220,34170.00
+"2004029",227,39020.00
+"2004029",237,37010.00
+"2004029",241,36660.00
+"2004029",248,37150.00
+"2004029",255,38140.00
+"2004029",262,36450.00
+"2004029",269,39020.00
+"2004029",276,37220.00
+"2004029",283,39900.00
+"2004029",290,41230.00
+"2004029",297,40680.00
+"2004029",304,40530.00
+"2004029",311,41460.00
+"2004029",318,42150.00
+"2004029",325,42370.00
+"2004029",331,45380.00
+"2004029",339,46430.00
+"2004029",346,46680.00
+"2004029",353,47250.00
+"2004029",360,49430.00
+"2004029",367,51030.00
+"2004029",374,52310.00
+"2004029",381,56000.00
+"2004029",388,58170.00
+"2004029",395,58690.00
+"2004029",402,61580.00
+"2004029",409,65430.00
+"2004029",416,68260.00
+"2004029",424,69470.00
+"2004029",428,57520.00
+"2004029",437,56200.00
+"2004029",444,54980.00
+"2004029",451,53930.00
+"2004029",458,54290.00
+"2004029",465,54260.00
+"2004029",473,53590.00
+"2004029",479,51830.00
+"2004029",486,51620.00
+"2004029",493,52200.00
+"2004029",500,54080.00
+"2004029",507,52600.00
+"2004029",514,51720.00
+"2004029",521,52480.00
+"2004029",528,51530.00
+"2004029",535,53250.00
+"2004029",542,52460.00
+"2004029",549,54200.00
+"2004029",556,53390.00
+"2004029",563,56620.00
+"2004029",570,55920.00
+"2004029",577,55570.00
+"2004029",584,56340.00
+"2004029",591,55810.00
+"2004029",597,57990.00
+"2004029",605,55970.00
+"2004029",612,57230.00
+"2004029",618,55270.00
+"2004029",626,59190.00
+"2004029",633,59430.00
+"2004029",640,59750.00
+"2004029",648,58880.00
+"2004029",654,59800.00
+"2004029",662,65330.00
+"2004029",667,64500.00
+"2004029",675,61380.00
+"2004029",682,67210.00
+"2004029",689,67040.00
+"2004029",695,68300.00
+"2004029",703,73800.00
+"2004029",710,76690.00
+"2004029",717,79660.00
+"2004029",724,81880.00
+"2004029",731,86380.00
+"2004029",733,86250.00
+"2004029",734,64490.00
+"2004029",738,65250.00
+"2004029",745,60790.00
+"2004029",752,52910.00
+"2004029",759,57200.00
+"2005115",0,4066.00
+"2005115",6,3714.00
+"2005115",13,5410.00
+"2005115",20,6330.00
+"2005115",27,7320.00
+"2005115",34,9430.00
+"2005115",41,10530.00
+"2005115",49,11760.00
+"2005115",56,12910.00
+"2005115",62,14650.00
+"2005115",69,15430.00
+"2005115",76,16240.00
+"2005115",83,17710.00
+"2005115",90,18350.00
+"2005115",97,19400.00
+"2005115",104,20350.00
+"2005115",111,20890.00
+"2005115",118,22080.00
+"2005115",125,23830.00
+"2005115",132,25020.00
+"2005115",139,25490.00
+"2005115",146,27520.00
+"2005115",153,28980.00
+"2005115",160,30130.00
+"2005115",167,28180.00
+"2005115",174,28610.00
+"2005115",181,31560.00
+"2005115",188,31750.00
+"2005115",195,32960.00
+"2005115",202,32950.00
+"2005115",209,35690.00
+"2005115",216,35860.00
+"2005115",222,36570.00
+"2005115",230,37420.00
+"2005115",237,38890.00
+"2005115",243,39790.00
+"2005115",251,40170.00
+"2005115",258,39110.00
+"2005115",265,39180.00
+"2005115",273,40460.00
+"2005115",279,39770.00
+"2005115",287,41520.00
+"2005115",292,42010.00
+"2005115",300,43490.00
+"2005115",307,45420.00
+"2005115",314,47560.00
+"2005115",320,48060.00
+"2005115",328,49030.00
+"2005115",335,50750.00
+"2005115",342,51660.00
+"2005115",349,54870.00
+"2005115",356,57180.00
+"2005115",363,59920.00
+"2005115",370,59990.00
+"2005115",377,62660.00
+"2005115",383,62660.00
+"2005115",384,54790.00
+"2005115",391,50570.00
+"2005115",398,51080.00
+"2005115",405,51600.00
+"2005115",412,52170.00
+"2005115",419,53620.00
+"2005115",425,54560.00
+"2005115",433,53580.00
+"2005115",440,54720.00
+"2005115",447,54710.00
+"2005115",454,55800.00
+"2005115",461,55230.00
+"2005115",468,55720.00
+"2005115",475,54890.00
+"2005115",482,58130.00
+"2005115",489,56410.00
+"2005115",496,57030.00
+"2005115",503,56830.00
+"2005115",510,58520.00
+"2005115",517,56750.00
+"2005115",524,56960.00
+"2005115",530,55010.00
+"2005115",538,55260.00
+"2005115",545,56590.00
+"2005115",552,54600.00
+"2005115",559,56210.00
+"2005115",566,56960.00
+"2005115",572,59260.00
+"2005115",580,57780.00
+"2005115",587,57990.00
+"2005115",593,58430.00
+"2005115",600,59430.00
+"2005115",607,59670.00
+"2005115",614,58680.00
+"2005115",622,57650.00
+"2005115",629,59520.00
+"2005115",635,62390.00
+"2005115",643,62090.00
+"2005115",650,63170.00
+"2005115",657,64770.00
+"2005115",664,64620.00
+"2005115",671,65440.00
+"2005115",678,66820.00
+"2005115",685,68630.00
+"2005115",692,68610.00
+"2005115",698,70750.00
+"2005115",706,73700.00
+"2005115",713,76200.00
+"2005115",720,80190.00
+"2005115",727,80010.00
+"2005115",733,65680.00
+"2005115",741,64090.00
+"2005115",748,62530.00
--- a/test-data/inputs/Litter_test.csv	Fri Jan 21 08:35:16 2022 +0000
+++ b/test-data/inputs/Litter_test.csv	Wed Aug 10 12:30:47 2022 +0000
@@ -1,6 +1,5 @@
-"id";"id_partnb";"age_part";"bw_litter"
-2004029;"2004029_1";427;5078
-2004029;"2004029_2";733;12524
-2005115;"2005115_1";383;6500
-2005115;"2005115_2";727;9400
-
+"id","id_partnb","age_part","bw_litter"
+"2004029","2004029_1",427,5078.00
+"2004029","2004029_2",733,12524.00
+"2005115","2005115_1",383,6500.00
+"2005115","2005115_2",727,9400.00
--- a/test-data/inputs/singlegoat_BW_test.csv	Fri Jan 21 08:35:16 2022 +0000
+++ b/test-data/inputs/singlegoat_BW_test.csv	Wed Aug 10 12:30:47 2022 +0000
@@ -1,109 +1,109 @@
-"id";"age";"bw_rec"
-2004029;0;5440
-2004029;24;9080
-2004029;31;10610
-2004029;38;11550
-2004029;45;12660
-2004029;52;14310
-2004029;66;13910
-2004029;73;14630
-2004029;81;15010
-2004029;87;15780
-2004029;94;16020
-2004029;101;17960
-2004029;108;20340
-2004029;115;19860
-2004029;123;21370
-2004029;129;23030
-2004029;136;23260
-2004029;143;24510
-2004029;150;26700
-2004029;158;27100
-2004029;164;28330
-2004029;165;28300
-2004029;171;27800
-2004029;178;31170
-2004029;185;30770
-2004029;192;31910
-2004029;199;31980
-2004029;206;33830
-2004029;220;34170
-2004029;227;39020
-2004029;237;37010
-2004029;241;36660
-2004029;248;37150
-2004029;255;38140
-2004029;262;36450
-2004029;269;39020
-2004029;276;37220
-2004029;283;39900
-2004029;290;41230
-2004029;297;40680
-2004029;304;40530
-2004029;311;41460
-2004029;318;42150
-2004029;325;42370
-2004029;331;45380
-2004029;339;46430
-2004029;346;46680
-2004029;353;47250
-2004029;360;49430
-2004029;367;51030
-2004029;374;52310
-2004029;381;56000
-2004029;388;58170
-2004029;395;58690
-2004029;402;61580
-2004029;409;65430
-2004029;416;68260
-2004029;424;69470
-2004029;428;57520
-2004029;437;56200
-2004029;444;54980
-2004029;451;53930
-2004029;458;54290
-2004029;465;54260
-2004029;473;53590
-2004029;479;51830
-2004029;486;51620
-2004029;493;52200
-2004029;500;54080
-2004029;507;52600
-2004029;514;51720
-2004029;521;52480
-2004029;528;51530
-2004029;535;53250
-2004029;542;52460
-2004029;549;54200
-2004029;556;53390
-2004029;563;56620
-2004029;570;55920
-2004029;577;55570
-2004029;584;56340
-2004029;591;55810
-2004029;597;57990
-2004029;605;55970
-2004029;612;57230
-2004029;618;55270
-2004029;626;59190
-2004029;633;59430
-2004029;640;59750
-2004029;648;58880
-2004029;654;59800
-2004029;662;65330
-2004029;667;64500
-2004029;675;61380
-2004029;682;67210
-2004029;689;67040
-2004029;695;68300
-2004029;703;73800
-2004029;710;76690
-2004029;717;79660
-2004029;724;81880
-2004029;731;86380
-2004029;733;86250
-2004029;734;64490
-2004029;738;65250
-2004029;745;60790
-2004029;752;52910
-2004029;759;57200
\ No newline at end of file
+"id","age","bw_rec"
+"2004029",0,5440.00
+"2004029",24,9080.00
+"2004029",31,10610.00
+"2004029",38,11550.00
+"2004029",45,12660.00
+"2004029",52,14310.00
+"2004029",66,13910.00
+"2004029",73,14630.00
+"2004029",81,15010.00
+"2004029",87,15780.00
+"2004029",94,16020.00
+"2004029",101,17960.00
+"2004029",108,20340.00
+"2004029",115,19860.00
+"2004029",123,21370.00
+"2004029",129,23030.00
+"2004029",136,23260.00
+"2004029",143,24510.00
+"2004029",150,26700.00
+"2004029",158,27100.00
+"2004029",164,28330.00
+"2004029",165,28300.00
+"2004029",171,27800.00
+"2004029",178,31170.00
+"2004029",185,30770.00
+"2004029",192,31910.00
+"2004029",199,31980.00
+"2004029",206,33830.00
+"2004029",220,34170.00
+"2004029",227,39020.00
+"2004029",237,37010.00
+"2004029",241,36660.00
+"2004029",248,37150.00
+"2004029",255,38140.00
+"2004029",262,36450.00
+"2004029",269,39020.00
+"2004029",276,37220.00
+"2004029",283,39900.00
+"2004029",290,41230.00
+"2004029",297,40680.00
+"2004029",304,40530.00
+"2004029",311,41460.00
+"2004029",318,42150.00
+"2004029",325,42370.00
+"2004029",331,45380.00
+"2004029",339,46430.00
+"2004029",346,46680.00
+"2004029",353,47250.00
+"2004029",360,49430.00
+"2004029",367,51030.00
+"2004029",374,52310.00
+"2004029",381,56000.00
+"2004029",388,58170.00
+"2004029",395,58690.00
+"2004029",402,61580.00
+"2004029",409,65430.00
+"2004029",416,68260.00
+"2004029",424,69470.00
+"2004029",428,57520.00
+"2004029",437,56200.00
+"2004029",444,54980.00
+"2004029",451,53930.00
+"2004029",458,54290.00
+"2004029",465,54260.00
+"2004029",473,53590.00
+"2004029",479,51830.00
+"2004029",486,51620.00
+"2004029",493,52200.00
+"2004029",500,54080.00
+"2004029",507,52600.00
+"2004029",514,51720.00
+"2004029",521,52480.00
+"2004029",528,51530.00
+"2004029",535,53250.00
+"2004029",542,52460.00
+"2004029",549,54200.00
+"2004029",556,53390.00
+"2004029",563,56620.00
+"2004029",570,55920.00
+"2004029",577,55570.00
+"2004029",584,56340.00
+"2004029",591,55810.00
+"2004029",597,57990.00
+"2004029",605,55970.00
+"2004029",612,57230.00
+"2004029",618,55270.00
+"2004029",626,59190.00
+"2004029",633,59430.00
+"2004029",640,59750.00
+"2004029",648,58880.00
+"2004029",654,59800.00
+"2004029",662,65330.00
+"2004029",667,64500.00
+"2004029",675,61380.00
+"2004029",682,67210.00
+"2004029",689,67040.00
+"2004029",695,68300.00
+"2004029",703,73800.00
+"2004029",710,76690.00
+"2004029",717,79660.00
+"2004029",724,81880.00
+"2004029",731,86380.00
+"2004029",733,86250.00
+"2004029",734,64490.00
+"2004029",738,65250.00
+"2004029",745,60790.00
+"2004029",752,52910.00
+"2004029",759,57200.00
--- a/test-data/inputs/singlegoat_Litter_test.csv	Fri Jan 21 08:35:16 2022 +0000
+++ b/test-data/inputs/singlegoat_Litter_test.csv	Wed Aug 10 12:30:47 2022 +0000
@@ -1,3 +1,3 @@
-"id";"id_partnb";"age_part";"bw_litter"
-2004029;"2004029_1";427;5078
-2004029;"2004029_2";733;12524
+"id","id_partnb","age_part","bw_litter"
+"2004029","2004029_1",427,5078.00
+"2004029","2004029_2",733,12524.00
--- a/tools_grum.xml	Fri Jan 21 08:35:16 2022 +0000
+++ b/tools_grum.xml	Wed Aug 10 12:30:47 2022 +0000
@@ -54,7 +54,7 @@
 	<param name="litter_input" type="data" format="csv" label="Litter file" optional="false"/>
 	<param name="bw_input" type="data" format="csv" label="Body weight file" optional="false"/>
 	<param name="ids" type="select" checked="true" optional="false" multiple="true" label="Select a set of mammals">
-	  <options from_dataset="litter_input"  separator=";">
+	  <options from_dataset="litter_input"  separator=",">
             <column name="name" index="0"/>
             <column name="value" index="0"/>
 	    <filter type="unique_value" name="unique_param" column="0"/>
@@ -115,7 +115,7 @@
       </conditional>
       <param name="litter_input" value="inputs/Litter_test.csv" ftype="csv" />
       <param name="bw_input" value="inputs/BW_test.csv" ftype="csv" />
-      <param name="ids" value="2004029,2005115" />
+      <param name="ids" value='"2004029","2005115"' />
       <conditional name="mammalParam">
 	<param name="choose" value="defaultGoat"/>
       </conditional>