Mercurial > repos > greg > insect_phenology_model

changeset 119:833f70d9001d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Uploaded
author greg
date Tue, 29 May 2018 14:31:39 -0400
parents e0bd1edbd8e4
children 635b6dc6b268
files insect_phenology_model.R
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/insect_phenology_model.R	Tue May 29 14:20:25 2018 -0400
+++ b/insect_phenology_model.R	Tue May 29 14:31:39 2018 -0400
@@ -65,6 +65,11 @@
     return(data_frame);
 }
 
+extract_date_interval_rows = function(df, start_date, end_date) {
+    date_interval_rows = df[df$DATE >= start_date & sf$DATE <= end_date];
+    return(date_interval_rows);
+}
+
 get_file_path = function(life_stage, base_name, life_stage_nymph=NULL, life_stage_adult=NULL) {
     if (!is.null(life_stage_nymph)) {
         lsi = get_life_stage_index(life_stage, life_stage_nymph=life_stage_nymph);
@@ -398,7 +403,7 @@
             end_date = temperature_data_frame$DATE[num_days];
         } else {
             # Extract the custom date interval from temperature_data_frame.
-            temperature_data_frame = temperature_data_frame[date %between% c(start_date, end_date)]
+            temperature_data_frame = extract_date_interval_rows(temperature_data_frame, start_date, end_date);
         }
         # Extract the year from the start date.
         date_str = format(start_date);
@@ -426,7 +431,7 @@
         total_days = get_total_days(is_leap_year);
     } else {
         # Extract the custom date interval from norm_data_frame.
-        norm_data_frame = norm_data_frame[date %between% c(start_date, end_date)]
+        norm_data_frame = extract_date_interval_rows(norm_data_frame, start_date, end_date);
         # Use the pre-determined num_days for total_days.
         total_days = num_days
     }