Mercurial > repos > greg > insect_phenology_model

diff insect_phenology_model.xml @ 28:afe6d8bac0c0 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Mon, 12 Mar 2018 09:15:16 -0400
parents 93209c167a61
children dd0f1b7528aa
line wrap: on
line diff
--- a/insect_phenology_model.xml	Fri Mar 09 13:41:38 2018 -0500
+++ b/insect_phenology_model.xml	Mon Mar 12 09:15:16 2018 -0400
@@ -123,23 +123,23 @@
             <param name="plot_egg_life_stage" value="no" />
             <param name="life_stages_nymph" value="Young" />
             <param name="life_stages_adult" value="Pre-vittelogenic" />
-            <output name="output" file="output1.csv" ftype="csv"/>
+            <output name="output" file="output1.csv" ftype="csv" compare="contains"/>
             <output_collection name="output_collection" type="list">
-                <element name="02_young_nymph_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="05_pre-vittelogenic_adult_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
+                <element name="02_young_nymph_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="05_pre-vittelogenic_adult_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
             </output_collection>
         </test>
-        <!--
         <test>
             <param name="input" value="state_college.csv" ftype="csv" />
             <param name="location" value="State College PA" />
             <param name="replications" value="2" />
             <param name="plot_generations_separately" value="no" />
+            <output name="output" file="output2.csv" ftype="csv" compare="contains"/>
             <output_collection name="output_collection" type="list">
-                <element name="01_egg_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="04_total_nymph_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="08_total_adult_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="09_total_pop.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
+                <element name="01_egg_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="04_total_nymph_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="08_total_adult_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="09_total_pop.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
             </output_collection>
         </test>
         <test>
@@ -149,22 +149,23 @@
             <param name="plot_egg_life_stage" value="no" />
             <param name="life_stages_nymph" value="Old" />
             <param name="plot_adult_life_stage" value="no" />
+            <output name="output" file="output3.csv" ftype="csv" compare="contains"/>
             <output_collection name="output_collection" type="list">
-                <element name="03_old_nymph_pop_by_generation.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
+                <element name="03_old_nymph_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
             </output_collection>
         </test>
         <test>
             <param name="input" value="state_college.csv" ftype="csv" />
             <param name="location" value="State College PA" />
             <param name="replications" value="2" />
+            <output name="output" file="output4.csv" ftype="csv" compare="contains"/>
             <output_collection name="output_collection" type="list">
-                <element name="01_egg_pop_by_generation.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="04_total_nymph_pop_by_generation.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="08_total_adult_pop_by_generation.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
-                <element name="09_total_pop_by_generation.pdf" file="pop_by_generation.pdf" ftype="pdf" compare="contains"/>
+                <element name="01_egg_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="04_total_nymph_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="08_total_adult_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
+                <element name="09_total_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>
             </output_collection>
         </test>
-        -->
     </tests>
     <help>
 **What it does**