| Previous changeset 111:37ac68b6ff10 (2018-02-13) Next changeset 113:bb61458966df (2018-05-29) |
|
Commit message:
Uploaded |
|
modified:
insect_phenology_model.R insect_phenology_model.xml |
|
added:
test-data/30_year_normals.csv test-data/output_combined1.csv test-data/output_combined2.csv test-data/output_combined3.csv test-data/output_combined4.csv test-data/output_f1_3.csv test-data/output_f1_4.csv test-data/output_f2_3.csv test-data/output_f2_4.csv test-data/output_p_3.csv test-data/output_p_4.csv test-data/plot.pdf test-data/state_college_partial.csv test-data/state_college_ytd.csv |
|
removed:
test-data/output.pdf test-data/state_college.csv |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 insect_phenology_model.R --- a/insect_phenology_model.R Tue Feb 13 13:47:32 2018 -0500 +++ b/insect_phenology_model.R Tue May 29 09:00:25 2018 -0400 |
| b |
| b'@@ -6,20 +6,24 @@\n make_option(c("--adult_mortality"), action="store", dest="adult_mortality", type="integer", help="Adjustment rate for adult mortality"),\n make_option(c("--adult_accumulation"), action="store", dest="adult_accumulation", type="integer", help="Adjustment of degree-days accumulation (old nymph->adult)"),\n make_option(c("--egg_mortality"), action="store", dest="egg_mortality", type="integer", help="Adjustment rate for egg mortality"),\n- make_option(c("--input"), action="store", dest="input", help="Temperature data for selected location"),\n+ make_option(c("--input_norm"), action="store", dest="input_norm", help="30 year normals temperature data for selected station"),\n+ make_option(c("--input_ytd"), action="store", dest="input_ytd", default=NULL, help="Year-to-date temperature data for selected location"),\n make_option(c("--insect"), action="store", dest="insect", help="Insect name"),\n make_option(c("--insects_per_replication"), action="store", dest="insects_per_replication", type="integer", help="Number of insects with which to start each replication"),\n- make_option(c("--location"), action="store", dest="location", help="Selected location"),\n+ make_option(c("--life_stages"), action="store", dest="life_stages", help="Selected life stages for plotting"),\n+ make_option(c("--life_stages_adult"), action="store", dest="life_stages_adult", default=NULL, help="Adult life stages for plotting"),\n+ make_option(c("--life_stages_nymph"), action="store", dest="life_stages_nymph", default=NULL, help="Nymph life stages for plotting"),\n+ make_option(c("--location"), action="store", dest="location", default=NULL, help="Selected location"),\n make_option(c("--min_clutch_size"), action="store", dest="min_clutch_size", type="integer", help="Adjustment of minimum clutch size"),\n make_option(c("--max_clutch_size"), action="store", dest="max_clutch_size", type="integer", help="Adjustment of maximum clutch size"),\n+ make_option(c("--num_days_ytd"), action="store", dest="num_days_ytd", default=NULL, type="integer", help="Total number of days in the year-to-date temperature dataset"),\n make_option(c("--nymph_mortality"), action="store", dest="nymph_mortality", type="integer", help="Adjustment rate for nymph mortality"),\n make_option(c("--old_nymph_accumulation"), action="store", dest="old_nymph_accumulation", type="integer", help="Adjustment of degree-days accumulation (young nymph->old nymph)"),\n- make_option(c("--num_days"), action="store", dest="num_days", type="integer", help="Total number of days in the temperature dataset"),\n- make_option(c("--output"), action="store", dest="output", help="Output dataset"),\n make_option(c("--oviposition"), action="store", dest="oviposition", type="integer", help="Adjustment for oviposition rate"),\n make_option(c("--photoperiod"), action="store", dest="photoperiod", type="double", help="Critical photoperiod for diapause induction/termination"),\n+ make_option(c("--plot_generations_separately"), action="store", dest="plot_generations_separately", help="Plot Plot P, F1 and F2 as separate lines or pool across them"),\n+ make_option(c("--plot_std_error"), action="store", dest="plot_std_error", help="Plot Standard error"),\n make_option(c("--replications"), action="store", dest="replications", type="integer", help="Number of replications"),\n- make_option(c("--std_error_plot"), action="store", dest="std_error_plot", help="Plot Standard error"),\n make_option(c("--young_nymph_accumulation"), action="store", dest="young_nymph_accumulation", type="integer", help="Adjustment of degree-days accumulation (egg->young nymph)")\n )\n \n@@ -27,9 +31,9 @@\n args <- parse_args(parser, positional_arguments=TRUE);\n opt <- args$options;\n \n-add_daylight_length = function(temperature_data_frame, num_columns, num_rows) {\n+add_daylight_length = function(temperature_data_frame, num_rows) {\n # Return a vector of daylight length (photoper'..b' if (life_stage_nymph=="Total") {\n+ # Total nymph population size.\n+ group = total_nymphs;\n+ group_std_error = total_nymphs.std_error;\n+ } else if (life_stage_nymph=="Young") {\n+ # Young nymph population size.\n+ group = young_nymphs;\n+ group_std_error = young_nymphs.std_error;\n+ } else if (life_stage_nymph=="Old") {\n+ # Old nymph population size.\n+ group = old_nymphs;\n+ group_std_error = old_nymphs.std_error;\n+ }\n+ maxval = max(group+group_std_error) + 100;\n+ render_chart(ticks, date_labels, "pop_size_by_life_stage", opt$plot_std_error, opt$insect, location, latitude,\n+ start_date, end_date, total_days_vector, maxval, opt$replications, life_stage, group=group, group_std_error=group_std_error,\n+ life_stages_nymph=life_stage_nymph);\n+ # Turn off device driver to flush output.\n+ dev.off();\n+ }\n+ } else if (life_stage == "Adult") {\n+ for (life_stage_adult in life_stages_adult) {\n+ # Start PDF device driver.\n+ dev.new(width=20, height=30);\n+ file_path = get_file_path(life_stage, "adult_pop.pdf", life_stage_adult=life_stage_adult)\n+ pdf(file=file_path, width=20, height=30, bg="white");\n+ par(mar=c(5, 6, 4, 4), mfrow=c(3, 1));\n+ if (life_stage_adult=="Total") {\n+ # Total adult population size.\n+ group = total_adults;\n+ group_std_error = total_adults.std_error\n+ } else if (life_stage_adult=="Pre-vittelogenic") {\n+ # Pre-vittelogenic adult population size.\n+ group = previttelogenic_adults;\n+ group_std_error = previttelogenic_adults.std_error\n+ } else if (life_stage_adult=="Vittelogenic") {\n+ # Vittelogenic adult population size.\n+ group = vittelogenic_adults;\n+ group_std_error = vittelogenic_adults.std_error\n+ } else if (life_stage_adult=="Diapausing") {\n+ # Diapausing adult population size.\n+ group = diapausing_adults;\n+ group_std_error = diapausing_adults.std_error\n+ }\n+ maxval = max(group+group_std_error) + 100;\n+ render_chart(ticks, date_labels, "pop_size_by_life_stage", opt$plot_std_error, opt$insect, location, latitude,\n+ start_date, end_date, total_days_vector, maxval, opt$replications, life_stage, group=group, group_std_error=group_std_error,\n+ life_stages_adult=life_stage_adult);\n+ # Turn off device driver to flush output.\n+ dev.off();\n+ }\n+ } else if (life_stage == "Total") {\n+ # Start PDF device driver.\n+ dev.new(width=20, height=30);\n+ file_path = get_file_path(life_stage, "total_pop.pdf")\n+ pdf(file=file_path, width=20, height=30, bg="white");\n+ par(mar=c(5, 6, 4, 4), mfrow=c(3, 1));\n+ # Total population size.\n+ maxval = max(eggs+eggs.std_error, total_nymphs+total_nymphs.std_error, total_adults+total_adults.std_error) + 100;\n+ render_chart(ticks, date_labels, "pop_size_by_life_stage", opt$plot_std_error, opt$insect, location, latitude,\n+ start_date, end_date, total_days_vector, maxval, opt$replications, life_stage, group=total_adults, group_std_error=total_adults.std_error,\n+ group2=total_nymphs, group2_std_error=total_nymphs.std_error, group3=eggs, group3_std_error=eggs.std_error);\n+ # Turn off device driver to flush output.\n+ dev.off();\n+ }\n+ }\n+}\n' |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 insect_phenology_model.xml --- a/insect_phenology_model.xml Tue Feb 13 13:47:32 2018 -0500 +++ b/insect_phenology_model.xml Tue May 29 09:00:25 2018 -0400 |
| [ |
| b'@@ -4,57 +4,229 @@\n <requirement type="package" version="1.4.4">r-optparse</requirement>\n </requirements>\n <command detect_errors="exit_code"><![CDATA[\n+#import os\n+#set output_data_dir = "output_data_dir"\n+#set output_plots_dir = "output_plots_dir"\n+#set error_file = $os.path.join($output_data_dir, "04_combined_generations.csv")\n+#set life_stages = list()\n+#set plot_adult_life_stage = $plot_adult_life_stage_cond.plot_adult_life_stage\n+#set plot_nymph_life_stage = $plot_nymph_life_stage_cond.plot_nymph_life_stage\n+#if str($plot_egg_life_stage) == "yes":\n+ $life_stages.append("Egg")\n+#end if\n+#if str($plot_nymph_life_stage) == "yes":\n+ $life_stages.append("Nymph")\n+#end if\n+#if str($plot_adult_life_stage) == "yes":\n+ $life_stages.append("Adult")\n+#end if\n+#if str($plot_egg_life_stage) == "yes" and str($plot_nymph_life_stage) == "yes" and str($plot_adult_life_stage) == "yes":\n+ $life_stages.append("Total")\n+#end if\n+#set life_stages = ",".join($life_stages)\n+mkdir output_data_dir &&\n+mkdir output_plots_dir &&\n Rscript \'$__tool_directory__/insect_phenology_model.R\'\n --adult_mortality $adult_mortality\n --adult_accumulation $adult_accumulation\n --egg_mortality $egg_mortality\n---input \'$input\'\n+#if str($merge_ytd_temperature_data_cond.merge_ytd_temperature_data) == "yes":\n+ --input_ytd \'$merge_ytd_temperature_data_cond.input_ytd\'\n+ --location \'$merge_ytd_temperature_data_cond.location\'\n+ --num_days_ytd $merge_ytd_temperature_data_cond.input_ytd.metadata.data_lines\n+#end if\n+--input_norm \'$input_norm\'\n --insect \'$insect\'\n --insects_per_replication $insects_per_replication\n---location \'$location\'\n+--life_stages \'$life_stages\'\n+#if str($plot_adult_life_stage) == "yes":\n+ --life_stages_adult \'$plot_adult_life_stage_cond.life_stages_adult\'\n+#end if\n+#if str($plot_nymph_life_stage) == "yes":\n+ --life_stages_nymph \'$plot_nymph_life_stage_cond.life_stages_nymph\'\n+#end if\n --max_clutch_size $max_clutch_size\n --min_clutch_size $min_clutch_size\n --nymph_mortality $nymph_mortality\n---num_days $input.metadata.data_lines\n --old_nymph_accumulation $old_nymph_accumulation\n---output \'$output\'\n --oviposition $oviposition\n --photoperiod $photoperiod\n --replications $replications\n---std_error_plot $std_error_plot\n---young_nymph_accumulation $young_nymph_accumulation]]></command>\n+--plot_generations_separately $plot_generations_separately\n+--plot_std_error $plot_std_error\n+--young_nymph_accumulation $young_nymph_accumulation\n+&>ipm_log.txt;\n+if [[ $? -ne 0 ]]; then\n+ cp ipm_log.txt \'$error_file\';\n+ exit 1;\n+fi]]></command>\n <inputs>\n- <param name="input" type="data" format="csv" label="Temperature data" />\n- <param name="location" type="text" value="" optional="false" label="Location" />\n+ <param name="input_norm" type="data" format="csv" label="30 year normals temperature data">\n+ <validator type="expression" message="30 year normals temperature data must have 10 columns and 366 rows">value is not None and value.metadata.columns==10 and value.metadata.data_lines==366</validator>\n+ </param>\n+ <conditional name="merge_ytd_temperature_data_cond">\n+ <param name="merge_ytd_temperature_data" type="select" label="Merge year-to-date temperature data with 30 year normals temperature data?">\n+ <option value="yes" selected="true">Yes</option>\n+ <option value="no">No</option>\n+ </param>\n+ <when value="yes">\n+ <param name="input_ytd" type="data" format="csv" label="Year-to-date temperature data">\n+ <validator type="expression" message="Year-to-date temperature data must have 6 columns">value is not None and value.metadata.columns==6</validator>\n+ </param>\n+ <param name="location" type="text" value="" optional="true" label="Location" help="Enter the location or leave blank to use the station name from 30 year normals data."/>\n+ </wh'..b' </test>\n+ <test>\n+ <param name="input_norm" value="30_year_normals.csv" ftype="csv"/>\n+ <param name="input_ytd" value="state_college_ytd.csv" ftype="csv"/>\n+ <param name="location" value="State College PA"/>\n+ <param name="replications" value="2"/>\n+ <output_collection name="output_data_collection" type="list">\n+ <element name="01_generation_P.csv" file="output_p_4.csv" ftype="csv" compare="contains"/>\n+ <element name="02_generation_F1.csv" file="output_f1_4.csv" ftype="csv" compare="contains"/>\n+ <element name="03_generation_F2.csv" file="output_f2_4.csv" ftype="csv" compare="contains"/>\n+ <element name="04_combined_generations.csv" file="output_combined4.csv" ftype="csv" compare="contains"/>\n+ </output_collection>\n+ <output_collection name="output_plots_collection" type="list">\n+ <element name="01_egg_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>\n+ <element name="04_total_nymph_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>\n+ <element name="08_total_adult_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>\n+ <element name="09_total_pop_by_generation.pdf" file="plot.pdf" ftype="pdf" compare="contains"/>\n+ </output_collection>\n </test>\n </tests>\n <help>\n@@ -66,8 +238,12 @@\n \n **Required options**\n \n+ * **30 year normals temperature data** - the dataset from your history containing the 30-year normals temperature data (available at http://pestwatch.psu.edu/ghcn).\n+ * **Merge year-to-date temperature data with 30 year normals temperature data** - select Yes to merge a year-to-date temperature dataset from your history into the selected 30 year normals temperature data.\n+\n+ * **Year-to-date temperature data** - the dataset from your history containing the year-to-date temperature data (available at http://pestwatch.psu.edu/minmax).\n+\n * **Location** - the location associated with the selected temperature data.\n- * **Temperature data** - select the dataset from your history containing the temperature data.\n * **Select insect** - currently only the Brown Marmorated Stink Bug can be analyzed.\n * **Number of replications** - number of replications.\n * **Number of insects with which to start each replication** - the analysis for each replication will start with this number of insects.\n@@ -81,8 +257,17 @@\n * **Adjustment of degree-days accumulation (egg->young nymph)** - adjustment of degree-days accumulation (egg->young nymph).\n * **Adjustment of degree-days accumulation (young nymph->old nymph)** - adjustment of degree-days accumulation (young nymph->old nymph).\n * **Adjustment of degree-days accumulation (old nymph->adult)** - adjustment of degree-days accumulation (old nymph->adult).\n+ * **Plot generations separately** - select "Yes" to plot P, F1 and F2 as separate lines or "no" to pool across generations, resulting in a total for the selected life states.\n+ * **Plot egg life stage** - select "Yes" to plot the egg life stage. If all life stages (egg, nymph and adult) are selected for plotting, one output for the total will be produced.\n+ * **Plot nymph life stage** - select "Yes" to plot the nymph life stage. If all life stages (egg, nymph and adult) are selected for plotting, one output for the total will be produced.\n+\n+ * **Select nymph life stage** - select the nymph life stage for plotting.\n+\n+ * **Plot adult life stage** - select "Yes" to plot the adult life stage. If all life stages (egg, nymph and adult) are selected for plotting, one output for the total will be produced.\n+\n+ * **Select adult life stage** - select the adult life stage for plotting.\n+\n * **Plot standard error** - add standard error lines to plot.\n-\n </help>\n <citations>\n <citation type="doi">10.3389/fphys.2016.00165</citation>\n' |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/30_year_normals.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/30_year_normals.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| b'@@ -0,0 +1,367 @@\n+stationid,latitude,longitude,elev_m,name,st,mmdd,doy,tmin,tmax\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-01, 001,-6.8,2.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-02, 002,-6.8,2.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-03, 003,-6.9,2.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-04, 004,-7.0,2.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-05, 005,-7.1,2.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-06, 006,-7.1,2.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-07, 007,-7.2,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-08, 008,-7.2,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-09, 009,-7.3,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-10, 010,-7.3,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-11, 011,-7.4,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-12, 012,-7.4,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-13, 013,-7.4,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-14, 014,-7.5,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-15, 015,-7.5,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-16, 016,-7.5,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-17, 017,-7.6,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-18, 018,-7.6,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-19, 019,-7.6,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-20, 020,-7.6,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-21, 021,-7.6,2.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-22, 022,-7.6,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-23, 023,-7.6,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-24, 024,-7.6,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-25, 025,-7.6,2.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-26, 026,-7.6,2.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-27, 027,-7.6,2.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-28, 028,-7.6,2.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-29, 029,-7.6,2.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-30, 030,-7.5,2.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,01-31, 031,-7.5,2.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-01, 032,-7.4,2.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-02, 033,-7.4,2.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-03, 034,-7.4,2.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-04, 035,-7.3,3.0\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-05, 036,-7.3,3.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-06, 037,-7.2,3.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-07, 038,-7.2,3.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-08, 039,-7.1,3.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-09, 040,-7.1,3.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-10, 041,-7.0,3.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-11, 042,-6.9,3.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-12, 043,-6.8,3.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-13, 044,-6.7,3.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-14, 045,-6.7,3.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-15, 046,-6.6,4.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-16, 047,-6.4,4.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-17, 048,-6.3,4.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-18, 049,-6.2,4.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-19, 050,-6.1,4.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-20, 051,-6.0,4.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,02-21, 052,-5.9,4.8\n+USC00360785,40.3'..b',11-08, 313,1.6,13.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-09, 314,1.4,12.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-10, 315,1.3,12.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-11, 316,1.2,12.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-12, 317,1.0,12.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-13, 318,0.9,11.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-14, 319,0.7,11.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-15, 320,0.6,11.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-16, 321,0.4,11.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-17, 322,0.3,11.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-18, 323,0.1,10.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-19, 324,-0.1,10.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-20, 325,-0.2,10.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-21, 326,-0.4,10.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-22, 327,-0.6,9.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-23, 328,-0.7,9.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-24, 329,-0.9,9.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-25, 330,-1.1,9.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-26, 331,-1.3,8.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-27, 332,-1.4,8.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-28, 333,-1.7,8.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-29, 334,-1.8,8.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,11-30, 335,-2.0,7.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-01, 336,-2.2,7.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-02, 337,-2.4,7.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-03, 338,-2.6,7.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-04, 339,-2.8,7.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-05, 340,-2.9,6.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-06, 341,-3.2,6.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-07, 342,-3.3,6.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-08, 343,-3.5,6.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-09, 344,-3.7,6.0\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-10, 345,-3.9,5.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-11, 346,-4.1,5.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-12, 347,-4.2,5.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-13, 348,-4.4,5.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-14, 349,-4.6,5.0\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-15, 350,-4.7,4.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-16, 351,-4.9,4.7\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-17, 352,-5.1,4.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-18, 353,-5.2,4.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-19, 354,-5.3,4.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-20, 355,-5.4,4.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-21, 356,-5.6,3.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-22, 357,-5.7,3.8\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-23, 358,-5.8,3.6\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-24, 359,-6.0,3.5\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-25, 360,-6.1,3.4\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-26, 361,-6.2,3.3\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-27, 362,-6.3,3.2\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-28, 363,-6.4,3.1\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-29, 364,-6.5,3.0\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-30, 365,-6.6,2.9\n+USC00360785,40.3844,-76.0339,106.7,BLUE MARSH LAKE,PA,12-31, 366,-6.7,2.8\n' |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output.pdf --- a/test-data/output.pdf Tue Feb 13 13:47:32 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| [ |
| @@ -1,45 +0,0 @@ -1 0 obj -<< -/Creator (R) ->> -endobj -2 0 obj -<< /Type /Catalog /Pages 3 0 R >> -endobj -7 0 obj -<< /Type /Page /Parent 3 0 R /Contents 8 0 R /Resources 4 0 R >> -endobj -3 0 obj -<< /Type /Pages /Kids [ 7 0 R ] /Count 1 /MediaBox [0 0 1440 1440] >> -endobj -4 0 obj -<< -/ProcSet [/PDF /Text] -/Font <</F2 10 0 R /F3 11 0 R >> -/ExtGState << >> -/ColorSpace << /sRGB 5 0 R >> ->> -endobj -5 0 obj -[/ICCBased 6 0 R] -endobj -9 0 obj -<< -/Type /Encoding /BaseEncoding /WinAnsiEncoding -/Differences [ 45/minus 96/quoteleft -144/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent -/dieresis /.notdef /ring /cedilla /.notdef /hungarumlaut /ogonek /caron /space] ->> -endobj -10 0 obj -<< /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica -/Encoding 9 0 R >> -endobj -11 0 obj -<< /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold -/Encoding 9 0 R >> -endobj -trailer -<< /Size 12 /Info 1 0 R /Root 2 0 R >> -startxref -%%EOF |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_combined1.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined1.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","YOUNGNYMPH","YOUNGNYMPHSE","PRE-VITADULT","PRE-VITADULTSE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_combined2.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined2.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_combined3.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined3.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH","OLDNYMPHSE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_combined4.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_combined4.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG","EGGSE","TOTALNYMPH","TOTALNYMPHSE","TOTALADULT","TOTALADULTSE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_f1_3.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f1_3.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH-F1","OLDNYMPH-F1-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_f1_4.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f1_4.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG-F1","EGG-F1-SE","TOTALNYMPH-F1","TOTALNYMPH-F1-SE","TOTALADULT-F1","TOTALADULT-F1-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_f2_3.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f2_3.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH-F2","OLDNYMPH-F2-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_f2_4.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_f2_4.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG-F2","EGG-F2-SE","TOTALNYMPH-F2","TOTALNYMPH-F2-SE","TOTALADULT-F2","TOTALADULT-F2-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_p_3.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_p_3.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","OLDNYMPH-P","OLDNYMPH-P-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/output_p_4.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/output_p_4.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,1 @@ +"LATITUDE","LONGITUDE","DATE","DOY","TMIN","TMAX","DAYLEN","EGG-P","EGG-P-SE","TOTALNYMPH-P","TOTALNYMPH-P-SE","TOTALADULT-P","TOTALADULT-P-SE" |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/plot.pdf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/plot.pdf Tue May 29 09:00:25 2018 -0400 |
| [ |
| @@ -0,0 +1,49 @@ +%PDF-1.4 +1 0 obj +/CreationDate +/ModDate +/Title (R Graphics Output) +/Producer +/Creator (R) +endobj +2 0 obj +<< /Type /Catalog /Pages 3 0 R >> +endobj +7 0 obj +<< /Type /Page /Parent 3 0 R /Contents 8 0 R /Resources 4 0 R >> +endobj +3 0 obj +<< /Type /Pages /Kids [ 7 0 R ] /Count 1 /MediaBox [0 0 1440 2160] >> +endobj +4 0 obj +<< +/ProcSet [/PDF /Text] +/Font <</F2 10 0 R /F3 11 0 R /F4 12 0 R >> +/ExtGState << >> +/ColorSpace << /sRGB 5 0 R >> +>> +endobj +5 0 obj +[/ICCBased 6 0 R] +endobj +9 0 obj +<< +/Type /Encoding /BaseEncoding /WinAnsiEncoding +/Differences [ 45/minus 96/quoteleft +144/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent +/dieresis /.notdef /ring /cedilla /.notdef /hungarumlaut /ogonek /caron /space] +>> +endobj +10 0 obj +<< /Type /Font /Subtype /Type1 /Name /F2 /BaseFont /Helvetica +/Encoding 9 0 R >> +endobj +11 0 obj +<< /Type /Font /Subtype /Type1 /Name /F3 /BaseFont /Helvetica-Bold +/Encoding 9 0 R >> +endobj +12 0 obj +<< /Type /Font /Subtype /Type1 /Name /F4 /BaseFont /Helvetica-Oblique +/Encoding 9 0 R >> +endobj +%%EOF |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/state_college.csv --- a/test-data/state_college.csv Tue Feb 13 13:47:32 2018 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
| b |
| b'@@ -1,184 +0,0 @@\n-LATITUDE,LONGITUDE,DATE,DOY,TMIN,TMAX\n- 40.81849,-77.84637,2017-04-01,091,3.30,7.66\n- 40.81849,-77.84637,2017-04-02,092,1.69,15.19\n- 40.81849,-77.84637,2017-04-03,093,3.48,18.81\n- 40.81849,-77.84637,2017-04-04,094,9.28,18.75\n- 40.81849,-77.84637,2017-04-05,095,8.14,19.01\n- 40.81849,-77.84637,2017-04-06,096,4.59,12.02\n- 40.81849,-77.84637,2017-04-07,097,1.19,3.66\n- 40.81849,-77.84637,2017-04-08,098,-0.56,13.85\n- 40.81849,-77.84637,2017-04-09,099,-2.32,21.96\n- 40.81849,-77.84637,2017-04-10,100,7.90,26.25\n- 40.81849,-77.84637,2017-04-11,101,9.25,26.48\n- 40.81849,-77.84637,2017-04-12,102,8.95,19.78\n- 40.81849,-77.84637,2017-04-13,103,4.00,15.47\n- 40.81849,-77.84637,2017-04-14,104,5.09,20.10\n- 40.81849,-77.84637,2017-04-15,105,8.44,25.02\n- 40.81849,-77.84637,2017-04-16,106,14.13,26.54\n- 40.81849,-77.84637,2017-04-17,107,8.23,20.59\n- 40.81849,-77.84637,2017-04-18,108,3.27,20.96\n- 40.81849,-77.84637,2017-04-19,109,9.76,13.40\n- 40.81849,-77.84637,2017-04-20,110,10.70,25.45\n- 40.81849,-77.84637,2017-04-21,111,11.74,22.34\n- 40.81849,-77.84637,2017-04-22,112,4.90,13.43\n- 40.81849,-77.84637,2017-04-23,113,0.43,20.16\n- 40.81849,-77.84637,2017-04-24,114,1.21,17.18\n- 40.81849,-77.84637,2017-04-25,115,9.93,14.30\n- 40.81849,-77.84637,2017-04-26,116,11.38,23.36\n- 40.81849,-77.84637,2017-04-27,117,12.42,23.94\n- 40.81849,-77.84637,2017-04-28,118,11.79,25.11\n- 40.81849,-77.84637,2017-04-29,119,11.14,24.38\n- 40.81849,-77.84637,2017-04-30,120,12.08,25.29\n- 40.81849,-77.84637,2017-05-01,121,13.37,25.43\n- 40.81849,-77.84637,2017-05-02,122,10.78,15.74\n- 40.81849,-77.84637,2017-05-03,123,5.09,16.41\n- 40.81849,-77.84637,2017-05-04,124,4.07,14.99\n- 40.81849,-77.84637,2017-05-05,125,8.04,17.02\n- 40.81849,-77.84637,2017-05-06,126,5.92,12.78\n- 40.81849,-77.84637,2017-05-07,127,2.90,12.05\n- 40.81849,-77.84637,2017-05-08,128,1.22,13.07\n- 40.81849,-77.84637,2017-05-09,129,-1.45,17.87\n- 40.81849,-77.84637,2017-05-10,130,5.94,19.31\n- 40.81849,-77.84637,2017-05-11,131,7.90,11.11\n- 40.81849,-77.84637,2017-05-12,132,8.75,12.95\n- 40.81849,-77.84637,2017-05-13,133,5.68,14.39\n- 40.81849,-77.84637,2017-05-14,134,5.94,19.81\n- 40.81849,-77.84637,2017-05-15,135,7.37,22.14\n- 40.81849,-77.84637,2017-05-16,136,5.18,26.96\n- 40.81849,-77.84637,2017-05-17,137,11.12,31.63\n- 40.81849,-77.84637,2017-05-18,138,15.39,32.05\n- 40.81849,-77.84637,2017-05-19,139,13.92,29.51\n- 40.81849,-77.84637,2017-05-20,140,9.38,13.55\n- 40.81849,-77.84637,2017-05-21,141,12.60,17.19\n- 40.81849,-77.84637,2017-05-22,142,10.93,23.45\n- 40.81849,-77.84637,2017-05-23,143,6.24,21.30\n- 40.81849,-77.84637,2017-05-24,144,10.97,21.61\n- 40.81849,-77.84637,2017-05-25,145,11.91,18.55\n- 40.81849,-77.84637,2017-05-26,146,13.00,19.09\n- 40.81849,-77.84637,2017-05-27,147,9.28,22.35\n- 40.81849,-77.84637,2017-05-28,148,13.02,19.25\n- 40.81849,-77.84637,2017-05-29,149,15.61,25.52\n- 40.81849,-77.84637,2017-05-30,150,14.89,20.32\n- 40.81849,-77.84637,2017-05-31,151,12.29,24.32\n- 40.81849,-77.84637,2017-06-01,152,9.02,22.91\n- 40.81849,-77.84637,2017-06-02,153,10.83,22.70\n- 40.81849,-77.84637,2017-06-03,154,10.01,25.36\n- 40.81849,-77.84637,2017-06-04,155,8.05,16.85\n- 40.81849,-77.84637,2017-06-05,156,14.04,23.52\n- 40.81849,-77.84637,2017-06-06,157,13.20,21.63\n- 40.81849,-77.84637,2017-06-07,158,9.99,17.12\n- 40.81849,-77.84637,2017-06-08,159,9.42,23.51\n- 40.81849,-77.84637,2017-06-09,160,10.71,25.54\n- 40.81849,-77.84637,2017-06-10,161,15.90,29.01\n- 40.81849,-77.84637,2017-06-11,162,15.11,31.46\n- 40.81849,-77.84637,2017-06-12,163,15.59,31.82\n- 40.81849,-77.84637,2017-06-13,164,18.19,34.21\n- 40.81849,-77.84637,2017-06-14,165,19.55,29.87\n- 40.81849,-77.84637,2017-06-15,166,17.02,27.22\n- 40.81849,-77.84637,2017-06-16,167,17.59,26.76\n- 40.81849,-77.84637,2017-06-17,168,17.43,29.03\n- 40.81849,-77.84637,2017-06-18,169,20.91,31.44\n- 40.81849,-77.84637,2017-06-19,170,17.51,24.38\n- 40.81849,-77.84637,2017-06-20,171,14.80,25.74\n- 40.81849,-77.84637,2017-06-21,172,13.97,26.99\n- 40.81849,-77.84637,2017-06-22,173,12.72,29.78\n'..b'4637,2017-07-09,190,11.83,26.33\n- 40.81849,-77.84637,2017-07-10,191,12.38,27.23\n- 40.81849,-77.84637,2017-07-11,192,17.98,28.99\n- 40.81849,-77.84637,2017-07-12,193,21.06,29.84\n- 40.81849,-77.84637,2017-07-13,194,21.07,28.19\n- 40.81849,-77.84637,2017-07-14,195,19.22,28.46\n- 40.81849,-77.84637,2017-07-15,196,16.50,24.54\n- 40.81849,-77.84637,2017-07-16,197,14.44,28.05\n- 40.81849,-77.84637,2017-07-17,198,17.26,30.80\n- 40.81849,-77.84637,2017-07-18,199,17.44,31.69\n- 40.81849,-77.84637,2017-07-19,200,16.67,32.40\n- 40.81849,-77.84637,2017-07-20,201,19.12,32.13\n- 40.81849,-77.84637,2017-07-21,202,20.94,31.43\n- 40.81849,-77.84637,2017-07-22,203,19.30,28.36\n- 40.81849,-77.84637,2017-07-23,204,20.25,30.59\n- 40.81849,-77.84637,2017-07-24,205,18.56,28.17\n- 40.81849,-77.84637,2017-07-25,206,15.18,22.72\n- 40.81849,-77.84637,2017-07-26,207,12.03,26.34\n- 40.81849,-77.84637,2017-07-27,208,16.35,29.74\n- 40.81849,-77.84637,2017-07-28,209,16.35,26.24\n- 40.81849,-77.84637,2017-07-29,210,11.05,23.78\n- 40.81849,-77.84637,2017-07-30,211,7.73,28.01\n- 40.81849,-77.84637,2017-07-31,212,13.66,30.13\n- 40.81849,-77.84637,2017-08-01,213,15.11,30.81\n- 40.81849,-77.84637,2017-08-02,214,16.56,30.22\n- 40.81849,-77.84637,2017-08-03,215,15.69,28.57\n- 40.81849,-77.84637,2017-08-04,216,16.07,30.48\n- 40.81849,-77.84637,2017-08-05,217,12.30,23.46\n- 40.81849,-77.84637,2017-08-06,218,11.46,23.44\n- 40.81849,-77.84637,2017-08-07,219,15.40,18.35\n- 40.81849,-77.84637,2017-08-08,220,12.19,25.48\n- 40.81849,-77.84637,2017-08-09,221,9.23,26.69\n- 40.81849,-77.84637,2017-08-10,222,9.53,25.78\n- 40.81849,-77.84637,2017-08-11,223,16.54,26.25\n- 40.81849,-77.84637,2017-08-12,224,16.29,26.87\n- 40.81849,-77.84637,2017-08-13,225,14.17,26.51\n- 40.81849,-77.84637,2017-08-14,226,13.98,22.43\n- 40.81849,-77.84637,2017-08-15,227,17.69,28.88\n- 40.81849,-77.84637,2017-08-16,228,14.84,29.43\n- 40.81849,-77.84637,2017-08-17,229,13.40,29.96\n- 40.81849,-77.84637,2017-08-18,230,19.42,29.00\n- 40.81849,-77.84637,2017-08-19,231,14.40,28.28\n- 40.81849,-77.84637,2017-08-20,232,12.31,27.77\n- 40.81849,-77.84637,2017-08-21,233,14.27,30.25\n- 40.81849,-77.84637,2017-08-22,234,18.44,31.05\n- 40.81849,-77.84637,2017-08-23,235,14.22,24.64\n- 40.81849,-77.84637,2017-08-24,236,10.30,23.00\n- 40.81849,-77.84637,2017-08-25,237,12.57,21.39\n- 40.81849,-77.84637,2017-08-26,238,10.93,23.29\n- 40.81849,-77.84637,2017-08-27,239,9.96,23.45\n- 40.81849,-77.84637,2017-08-28,240,9.26,22.38\n- 40.81849,-77.84637,2017-08-29,241,13.80,19.09\n- 40.81849,-77.84637,2017-08-30,242,10.88,24.45\n- 40.81849,-77.84637,2017-08-31,243,13.15,24.42\n- 40.81849,-77.84637,2017-09-01,244,7.82,17.91\n- 40.81849,-77.84637,2017-09-02,245,6.20,13.16\n- 40.81849,-77.84637,2017-09-03,246,12.37,19.35\n- 40.81849,-77.84637,2017-09-04,247,10.67,26.97\n- 40.81849,-77.84637,2017-09-05,248,15.39,21.54\n- 40.81849,-77.84637,2017-09-06,249,13.80,18.10\n- 40.81849,-77.84637,2017-09-07,250,9.30,18.45\n- 40.81849,-77.84637,2017-09-08,251,8.86,18.11\n- 40.81849,-77.84637,2017-09-09,252,8.44,18.21\n- 40.81849,-77.84637,2017-09-10,253,3.93,9.19\n- 40.81849,-77.84637,2017-09-11,254,4.98,22.12\n- 40.81849,-77.84637,2017-09-12,255,8.70,24.06\n- 40.81849,-77.84637,2017-09-13,256,12.75,23.14\n- 40.81849,-77.84637,2017-09-14,257,16.60,19.18\n- 40.81849,-77.84637,2017-09-15,258,14.89,25.28\n- 40.81849,-77.84637,2017-09-16,259,14.73,25.42\n- 40.81849,-77.84637,2017-09-17,260,14.85,27.42\n- 40.81849,-77.84637,2017-09-18,261,16.12,26.18\n- 40.81849,-77.84637,2017-09-19,262,13.36,25.46\n- 40.81849,-77.84637,2017-09-20,263,10.90,28.76\n- 40.81849,-77.84637,2017-09-21,264,11.68,28.44\n- 40.81849,-77.84637,2017-09-22,265,13.10,29.03\n- 40.81849,-77.84637,2017-09-23,266,10.11,30.51\n- 40.81849,-77.84637,2017-09-24,267,12.33,31.11\n- 40.81849,-77.84637,2017-09-25,268,15.03,31.81\n- 40.81849,-77.84637,2017-09-26,269,16.01,30.96\n- 40.81849,-77.84637,2017-09-27,270,15.03,31.27\n- 40.81849,-77.84637,2017-09-28,271,9.61,21.39\n- 40.81849,-77.84637,2017-09-29,272,6.03,20.71\n- 40.81849,-77.84637,2017-09-30,273,2.85,15.23\n' |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/state_college_partial.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/state_college_partial.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| b'@@ -0,0 +1,184 @@\n+LATITUDE,LONGITUDE,DATE,DOY,TMIN,TMAX\n+ 40.81849,-77.84637,2017-04-01,091,3.30,7.66\n+ 40.81849,-77.84637,2017-04-02,092,1.69,15.19\n+ 40.81849,-77.84637,2017-04-03,093,3.48,18.81\n+ 40.81849,-77.84637,2017-04-04,094,9.28,18.75\n+ 40.81849,-77.84637,2017-04-05,095,8.14,19.01\n+ 40.81849,-77.84637,2017-04-06,096,4.59,12.02\n+ 40.81849,-77.84637,2017-04-07,097,1.19,3.66\n+ 40.81849,-77.84637,2017-04-08,098,-0.56,13.85\n+ 40.81849,-77.84637,2017-04-09,099,-2.32,21.96\n+ 40.81849,-77.84637,2017-04-10,100,7.90,26.25\n+ 40.81849,-77.84637,2017-04-11,101,9.25,26.48\n+ 40.81849,-77.84637,2017-04-12,102,8.95,19.78\n+ 40.81849,-77.84637,2017-04-13,103,4.00,15.47\n+ 40.81849,-77.84637,2017-04-14,104,5.09,20.10\n+ 40.81849,-77.84637,2017-04-15,105,8.44,25.02\n+ 40.81849,-77.84637,2017-04-16,106,14.13,26.54\n+ 40.81849,-77.84637,2017-04-17,107,8.23,20.59\n+ 40.81849,-77.84637,2017-04-18,108,3.27,20.96\n+ 40.81849,-77.84637,2017-04-19,109,9.76,13.40\n+ 40.81849,-77.84637,2017-04-20,110,10.70,25.45\n+ 40.81849,-77.84637,2017-04-21,111,11.74,22.34\n+ 40.81849,-77.84637,2017-04-22,112,4.90,13.43\n+ 40.81849,-77.84637,2017-04-23,113,0.43,20.16\n+ 40.81849,-77.84637,2017-04-24,114,1.21,17.18\n+ 40.81849,-77.84637,2017-04-25,115,9.93,14.30\n+ 40.81849,-77.84637,2017-04-26,116,11.38,23.36\n+ 40.81849,-77.84637,2017-04-27,117,12.42,23.94\n+ 40.81849,-77.84637,2017-04-28,118,11.79,25.11\n+ 40.81849,-77.84637,2017-04-29,119,11.14,24.38\n+ 40.81849,-77.84637,2017-04-30,120,12.08,25.29\n+ 40.81849,-77.84637,2017-05-01,121,13.37,25.43\n+ 40.81849,-77.84637,2017-05-02,122,10.78,15.74\n+ 40.81849,-77.84637,2017-05-03,123,5.09,16.41\n+ 40.81849,-77.84637,2017-05-04,124,4.07,14.99\n+ 40.81849,-77.84637,2017-05-05,125,8.04,17.02\n+ 40.81849,-77.84637,2017-05-06,126,5.92,12.78\n+ 40.81849,-77.84637,2017-05-07,127,2.90,12.05\n+ 40.81849,-77.84637,2017-05-08,128,1.22,13.07\n+ 40.81849,-77.84637,2017-05-09,129,-1.45,17.87\n+ 40.81849,-77.84637,2017-05-10,130,5.94,19.31\n+ 40.81849,-77.84637,2017-05-11,131,7.90,11.11\n+ 40.81849,-77.84637,2017-05-12,132,8.75,12.95\n+ 40.81849,-77.84637,2017-05-13,133,5.68,14.39\n+ 40.81849,-77.84637,2017-05-14,134,5.94,19.81\n+ 40.81849,-77.84637,2017-05-15,135,7.37,22.14\n+ 40.81849,-77.84637,2017-05-16,136,5.18,26.96\n+ 40.81849,-77.84637,2017-05-17,137,11.12,31.63\n+ 40.81849,-77.84637,2017-05-18,138,15.39,32.05\n+ 40.81849,-77.84637,2017-05-19,139,13.92,29.51\n+ 40.81849,-77.84637,2017-05-20,140,9.38,13.55\n+ 40.81849,-77.84637,2017-05-21,141,12.60,17.19\n+ 40.81849,-77.84637,2017-05-22,142,10.93,23.45\n+ 40.81849,-77.84637,2017-05-23,143,6.24,21.30\n+ 40.81849,-77.84637,2017-05-24,144,10.97,21.61\n+ 40.81849,-77.84637,2017-05-25,145,11.91,18.55\n+ 40.81849,-77.84637,2017-05-26,146,13.00,19.09\n+ 40.81849,-77.84637,2017-05-27,147,9.28,22.35\n+ 40.81849,-77.84637,2017-05-28,148,13.02,19.25\n+ 40.81849,-77.84637,2017-05-29,149,15.61,25.52\n+ 40.81849,-77.84637,2017-05-30,150,14.89,20.32\n+ 40.81849,-77.84637,2017-05-31,151,12.29,24.32\n+ 40.81849,-77.84637,2017-06-01,152,9.02,22.91\n+ 40.81849,-77.84637,2017-06-02,153,10.83,22.70\n+ 40.81849,-77.84637,2017-06-03,154,10.01,25.36\n+ 40.81849,-77.84637,2017-06-04,155,8.05,16.85\n+ 40.81849,-77.84637,2017-06-05,156,14.04,23.52\n+ 40.81849,-77.84637,2017-06-06,157,13.20,21.63\n+ 40.81849,-77.84637,2017-06-07,158,9.99,17.12\n+ 40.81849,-77.84637,2017-06-08,159,9.42,23.51\n+ 40.81849,-77.84637,2017-06-09,160,10.71,25.54\n+ 40.81849,-77.84637,2017-06-10,161,15.90,29.01\n+ 40.81849,-77.84637,2017-06-11,162,15.11,31.46\n+ 40.81849,-77.84637,2017-06-12,163,15.59,31.82\n+ 40.81849,-77.84637,2017-06-13,164,18.19,34.21\n+ 40.81849,-77.84637,2017-06-14,165,19.55,29.87\n+ 40.81849,-77.84637,2017-06-15,166,17.02,27.22\n+ 40.81849,-77.84637,2017-06-16,167,17.59,26.76\n+ 40.81849,-77.84637,2017-06-17,168,17.43,29.03\n+ 40.81849,-77.84637,2017-06-18,169,20.91,31.44\n+ 40.81849,-77.84637,2017-06-19,170,17.51,24.38\n+ 40.81849,-77.84637,2017-06-20,171,14.80,25.74\n+ 40.81849,-77.84637,2017-06-21,172,13.97,26.99\n+ 40.81849,-77.84637,2017-06-22,173,12.72,29.78\n'..b'4637,2017-07-09,190,11.83,26.33\n+ 40.81849,-77.84637,2017-07-10,191,12.38,27.23\n+ 40.81849,-77.84637,2017-07-11,192,17.98,28.99\n+ 40.81849,-77.84637,2017-07-12,193,21.06,29.84\n+ 40.81849,-77.84637,2017-07-13,194,21.07,28.19\n+ 40.81849,-77.84637,2017-07-14,195,19.22,28.46\n+ 40.81849,-77.84637,2017-07-15,196,16.50,24.54\n+ 40.81849,-77.84637,2017-07-16,197,14.44,28.05\n+ 40.81849,-77.84637,2017-07-17,198,17.26,30.80\n+ 40.81849,-77.84637,2017-07-18,199,17.44,31.69\n+ 40.81849,-77.84637,2017-07-19,200,16.67,32.40\n+ 40.81849,-77.84637,2017-07-20,201,19.12,32.13\n+ 40.81849,-77.84637,2017-07-21,202,20.94,31.43\n+ 40.81849,-77.84637,2017-07-22,203,19.30,28.36\n+ 40.81849,-77.84637,2017-07-23,204,20.25,30.59\n+ 40.81849,-77.84637,2017-07-24,205,18.56,28.17\n+ 40.81849,-77.84637,2017-07-25,206,15.18,22.72\n+ 40.81849,-77.84637,2017-07-26,207,12.03,26.34\n+ 40.81849,-77.84637,2017-07-27,208,16.35,29.74\n+ 40.81849,-77.84637,2017-07-28,209,16.35,26.24\n+ 40.81849,-77.84637,2017-07-29,210,11.05,23.78\n+ 40.81849,-77.84637,2017-07-30,211,7.73,28.01\n+ 40.81849,-77.84637,2017-07-31,212,13.66,30.13\n+ 40.81849,-77.84637,2017-08-01,213,15.11,30.81\n+ 40.81849,-77.84637,2017-08-02,214,16.56,30.22\n+ 40.81849,-77.84637,2017-08-03,215,15.69,28.57\n+ 40.81849,-77.84637,2017-08-04,216,16.07,30.48\n+ 40.81849,-77.84637,2017-08-05,217,12.30,23.46\n+ 40.81849,-77.84637,2017-08-06,218,11.46,23.44\n+ 40.81849,-77.84637,2017-08-07,219,15.40,18.35\n+ 40.81849,-77.84637,2017-08-08,220,12.19,25.48\n+ 40.81849,-77.84637,2017-08-09,221,9.23,26.69\n+ 40.81849,-77.84637,2017-08-10,222,9.53,25.78\n+ 40.81849,-77.84637,2017-08-11,223,16.54,26.25\n+ 40.81849,-77.84637,2017-08-12,224,16.29,26.87\n+ 40.81849,-77.84637,2017-08-13,225,14.17,26.51\n+ 40.81849,-77.84637,2017-08-14,226,13.98,22.43\n+ 40.81849,-77.84637,2017-08-15,227,17.69,28.88\n+ 40.81849,-77.84637,2017-08-16,228,14.84,29.43\n+ 40.81849,-77.84637,2017-08-17,229,13.40,29.96\n+ 40.81849,-77.84637,2017-08-18,230,19.42,29.00\n+ 40.81849,-77.84637,2017-08-19,231,14.40,28.28\n+ 40.81849,-77.84637,2017-08-20,232,12.31,27.77\n+ 40.81849,-77.84637,2017-08-21,233,14.27,30.25\n+ 40.81849,-77.84637,2017-08-22,234,18.44,31.05\n+ 40.81849,-77.84637,2017-08-23,235,14.22,24.64\n+ 40.81849,-77.84637,2017-08-24,236,10.30,23.00\n+ 40.81849,-77.84637,2017-08-25,237,12.57,21.39\n+ 40.81849,-77.84637,2017-08-26,238,10.93,23.29\n+ 40.81849,-77.84637,2017-08-27,239,9.96,23.45\n+ 40.81849,-77.84637,2017-08-28,240,9.26,22.38\n+ 40.81849,-77.84637,2017-08-29,241,13.80,19.09\n+ 40.81849,-77.84637,2017-08-30,242,10.88,24.45\n+ 40.81849,-77.84637,2017-08-31,243,13.15,24.42\n+ 40.81849,-77.84637,2017-09-01,244,7.82,17.91\n+ 40.81849,-77.84637,2017-09-02,245,6.20,13.16\n+ 40.81849,-77.84637,2017-09-03,246,12.37,19.35\n+ 40.81849,-77.84637,2017-09-04,247,10.67,26.97\n+ 40.81849,-77.84637,2017-09-05,248,15.39,21.54\n+ 40.81849,-77.84637,2017-09-06,249,13.80,18.10\n+ 40.81849,-77.84637,2017-09-07,250,9.30,18.45\n+ 40.81849,-77.84637,2017-09-08,251,8.86,18.11\n+ 40.81849,-77.84637,2017-09-09,252,8.44,18.21\n+ 40.81849,-77.84637,2017-09-10,253,3.93,9.19\n+ 40.81849,-77.84637,2017-09-11,254,4.98,22.12\n+ 40.81849,-77.84637,2017-09-12,255,8.70,24.06\n+ 40.81849,-77.84637,2017-09-13,256,12.75,23.14\n+ 40.81849,-77.84637,2017-09-14,257,16.60,19.18\n+ 40.81849,-77.84637,2017-09-15,258,14.89,25.28\n+ 40.81849,-77.84637,2017-09-16,259,14.73,25.42\n+ 40.81849,-77.84637,2017-09-17,260,14.85,27.42\n+ 40.81849,-77.84637,2017-09-18,261,16.12,26.18\n+ 40.81849,-77.84637,2017-09-19,262,13.36,25.46\n+ 40.81849,-77.84637,2017-09-20,263,10.90,28.76\n+ 40.81849,-77.84637,2017-09-21,264,11.68,28.44\n+ 40.81849,-77.84637,2017-09-22,265,13.10,29.03\n+ 40.81849,-77.84637,2017-09-23,266,10.11,30.51\n+ 40.81849,-77.84637,2017-09-24,267,12.33,31.11\n+ 40.81849,-77.84637,2017-09-25,268,15.03,31.81\n+ 40.81849,-77.84637,2017-09-26,269,16.01,30.96\n+ 40.81849,-77.84637,2017-09-27,270,15.03,31.27\n+ 40.81849,-77.84637,2017-09-28,271,9.61,21.39\n+ 40.81849,-77.84637,2017-09-29,272,6.03,20.71\n+ 40.81849,-77.84637,2017-09-30,273,2.85,15.23\n' |
| b |
| diff -r 37ac68b6ff10 -r bcb12b7e8563 test-data/state_college_ytd.csv --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test-data/state_college_ytd.csv Tue May 29 09:00:25 2018 -0400 |
| b |
| @@ -0,0 +1,100 @@ +LATITUDE,LONGITUDE,DATE,DOY,TMIN,TMAX + 40.80134,-77.86835,2018-01-01,001,-20.26,-9.74 + 40.80134,-77.86835,2018-01-02,002,-14.29,-8.32 + 40.80134,-77.86835,2018-01-03,003,-19.25,-3.36 + 40.80134,-77.86835,2018-01-04,004,-13.33,-6.89 + 40.80134,-77.86835,2018-01-05,005,-16.53,-12.07 + 40.80134,-77.86835,2018-01-06,006,-17.72,-12.55 + 40.80134,-77.86835,2018-01-07,007,-20.16,-6.60 + 40.80134,-77.86835,2018-01-08,008,-7.99,3.50 + 40.80134,-77.86835,2018-01-09,009,-5.41,3.07 + 40.80134,-77.86835,2018-01-10,010,-8.00,4.18 + 40.80134,-77.86835,2018-01-11,011,-0.20,12.67 + 40.80134,-77.86835,2018-01-12,012,2.38,16.38 + 40.80134,-77.86835,2018-01-13,013,-12.51,1.50 + 40.80134,-77.86835,2018-01-14,014,-16.12,-7.91 + 40.80134,-77.86835,2018-01-15,015,-16.65,-5.04 + 40.80134,-77.86835,2018-01-16,016,-6.14,-2.58 + 40.80134,-77.86835,2018-01-17,017,-14.44,-6.61 + 40.80134,-77.86835,2018-01-18,018,-12.40,-2.44 + 40.80134,-77.86835,2018-01-19,019,-4.40,5.32 + 40.80134,-77.86835,2018-01-20,020,0.72,8.64 + 40.80134,-77.86835,2018-01-21,021,3.06,6.34 + 40.80134,-77.86835,2018-01-22,022,3.09,8.95 + 40.80134,-77.86835,2018-01-23,023,2.35,9.01 + 40.80134,-77.86835,2018-01-24,024,-3.07,2.04 + 40.80134,-77.86835,2018-01-25,025,-6.44,-0.72 + 40.80134,-77.86835,2018-01-26,026,-9.51,5.99 + 40.80134,-77.86835,2018-01-27,027,-5.10,9.99 + 40.80134,-77.86835,2018-01-28,028,-1.03,8.57 + 40.80134,-77.86835,2018-01-29,029,-5.84,4.95 + 40.80134,-77.86835,2018-01-30,030,-9.58,-0.43 + 40.80134,-77.86835,2018-01-31,031,-11.68,-0.44 + 40.80134,-77.86835,2018-02-01,032,-1.10,8.19 + 40.80134,-77.86835,2018-02-02,033,-10.86,-0.76 + 40.80134,-77.86835,2018-02-03,034,-11.08,-1.19 + 40.80134,-77.86835,2018-02-04,035,-2.60,-0.23 + 40.80134,-77.86835,2018-02-05,036,-9.35,0.85 + 40.80134,-77.86835,2018-02-06,037,-7.56,-1.36 + 40.80134,-77.86835,2018-02-07,038,-5.10,0.79 + 40.80134,-77.86835,2018-02-08,039,-10.09,-3.75 + 40.80134,-77.86835,2018-02-09,040,-12.70,0.51 + 40.80134,-77.86835,2018-02-10,041,-2.88,5.99 + 40.80134,-77.86835,2018-02-11,042,0.76,6.80 + 40.80134,-77.86835,2018-02-12,043,-6.21,3.97 + 40.80134,-77.86835,2018-02-13,044,-10.04,2.79 + 40.80134,-77.86835,2018-02-14,045,0.30,8.46 + 40.80134,-77.86835,2018-02-15,046,3.36,18.49 + 40.80134,-77.86835,2018-02-16,047,-2.37,12.56 + 40.80134,-77.86835,2018-02-17,048,-7.41,0.46 + 40.80134,-77.86835,2018-02-18,049,-3.16,4.39 + 40.80134,-77.86835,2018-02-19,050,0.50,5.05 + 40.80134,-77.86835,2018-02-20,051,-0.80,22.58 + 40.80134,-77.86835,2018-02-21,052,7.72,23.23 + 40.80134,-77.86835,2018-02-22,053,0.74,6.89 + 40.80134,-77.86835,2018-02-23,054,2.28,5.92 + 40.80134,-77.86835,2018-02-24,055,4.33,6.73 + 40.80134,-77.86835,2018-02-25,056,6.11,11.69 + 40.80134,-77.86835,2018-02-26,057,-0.37,11.10 + 40.80134,-77.86835,2018-02-27,058,-4.11,13.17 + 40.80134,-77.86835,2018-02-28,059,-2.18,17.90 + 40.80134,-77.86835,2018-03-01,060,6.02,11.61 + 40.80134,-77.86835,2018-03-02,061,-1.03,3.00 + 40.80134,-77.86835,2018-03-03,062,-2.10,2.03 + 40.80134,-77.86835,2018-03-04,063,-3.50,5.08 + 40.80134,-77.86835,2018-03-05,064,-6.67,4.95 + 40.80134,-77.86835,2018-03-06,065,-7.71,3.54 + 40.80134,-77.86835,2018-03-07,066,-0.74,3.48 + 40.80134,-77.86835,2018-03-08,067,-3.88,0.31 + 40.80134,-77.86835,2018-03-09,068,-3.31,0.05 + 40.80134,-77.86835,2018-03-10,069,-5.00,2.10 + 40.80134,-77.86835,2018-03-11,070,-7.37,5.51 + 40.80134,-77.86835,2018-03-12,071,-4.72,1.93 + 40.80134,-77.86835,2018-03-13,072,-4.08,1.61 + 40.80134,-77.86835,2018-03-14,073,-4.61,-1.02 + 40.80134,-77.86835,2018-03-15,074,-3.90,2.32 + 40.80134,-77.86835,2018-03-16,075,-5.15,0.28 + 40.80134,-77.86835,2018-03-17,076,-7.89,6.63 + 40.80134,-77.86835,2018-03-18,077,-3.63,10.45 + 40.80134,-77.86835,2018-03-19,078,-4.49,8.01 + 40.80134,-77.86835,2018-03-20,079,-3.55,2.47 + 40.80134,-77.86835,2018-03-21,080,-3.44,1.55 + 40.80134,-77.86835,2018-03-22,081,-3.83,6.05 + 40.80134,-77.86835,2018-03-23,082,-2.85,4.62 + 40.80134,-77.86835,2018-03-24,083,-5.87,8.40 + 40.80134,-77.86835,2018-03-25,084,-7.32,5.64 + 40.80134,-77.86835,2018-03-26,085,-5.39,8.86 + 40.80134,-77.86835,2018-03-27,086,0.45,3.33 + 40.80134,-77.86835,2018-03-28,087,2.11,7.94 + 40.80134,-77.86835,2018-03-29,088,5.79,14.16 + 40.80134,-77.86835,2018-03-30,089,0.63,12.72 + 40.80134,-77.86835,2018-03-31,090,-3.31,14.13 + 40.80134,-77.86835,2018-04-01,091,3.20,10.54 + 40.80134,-77.86835,2018-04-02,092,-0.15,6.90 + 40.80134,-77.86835,2018-04-03,093,2.23,8.17 + 40.80134,-77.86835,2018-04-04,094,-0.87,11.30 + 40.80134,-77.86835,2018-04-05,095,-3.37,4.04 + 40.80134,-77.86835,2018-04-06,096,-2.22,13.64 + 40.80134,-77.86835,2018-04-07,097,-4.31,2.84 + 40.80134,-77.86835,2018-04-08,098,-6.89,2.72 + 40.80134,-77.86835,2018-04-09,099,-3.82,3.49 |