Merge pull request #19 from wdwatkins/master

formula fix

DESCRIPTION

@@ -1,9 +1,12 @@
 Package: rloadest
 Type: Package
 Title: River Load Estimation
-Version: 0.4.3
-Date: 2015-12-03
-Author: Dave Lorenz, Rob Runkel, Laura De Cicco
+Version: 0.4.4
+Date: 2017-01-10
+Authors@R: c( person("Dave", "Lorenz", email = "[email protected]", role = "cre"),
+              person("Rob", "Runkel", role = "aut"),
+              person("Laura", "De Cicco", role = "aut"), 
+              person("David", "Watkins", role = "ctb"))
 Maintainer: Dave Lorenz <[email protected]>
 Description: Collection of functions to make constituent load estimations
     based on the LOADEST program.
@@ -17,10 +20,11 @@ Depends:
 Imports:
     lubridate,
     stats,
-	  segmented
+    segmented
 Suggests:
     dataRetrieval,
     EGRET,
     survival
 LazyLoad: yes
 LazyData: yes
+RoxygenNote: 5.0.1

R/loadReg.R

@@ -80,7 +80,10 @@ loadReg <- function(formula, data, subset, na.action, flow, dates,
   ## Make sure that the formula is a formula and not a symbol--this
   # improves output and subsequent formula references
   if (typeof(call$formula) == "symbol") {
-    call$formula <- formula(Terms)
+    #terms above is null 
+    #formulas were not being converted from symbols, and causing errors at ~127
+    call$formula <- formula
+    m[['formula']] <- formula
   }
   ## remove components not needed for model.frame
   m$flow <- m$dates  <- m$flow.units <- m$conc.units <- NULL