Merge pull request #3 from nstauffer/dev

Adding AIM/LMF integration

.gitignore

@@ -11,3 +11,4 @@ example_indicator_plot_201117.png
 example_catanalysis_output.csv
 sf_intersection_functions_scratchpad.R
 rgeos_intersection_functions_scratchpad.R
+lmf_integration_scratchpad.R

NAMESPACE

@@ -1,11 +1,11 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method(plot,date.distribution)
 export(add.area)
 export(add_coords)
 export(analyze)
 export(apply_benchmarks)
 export(attribute.shapefile)
+export(clip_rgeos)
 export(combine_points)
 export(combine_tdat_design)
 export(dd.split)
@@ -18,6 +18,7 @@ export(intersect_rgeos)
 export(mulitplot_fate_distribution)
 export(multiplot_indicator_distribution)
 export(order_polygons)
+export(plot.date.distribution)
 export(plot_fate_distribution)
 export(plot_indicator_distribution)
 export(punchout)
@@ -35,5 +36,6 @@ export(sf_intersect)
 export(validate.keys)
 export(weight.adjust)
 export(weight.gen)
+export(weight_aimlmf)
 export(wgtcat_gen)
 export(write.analysis)

R/spatial_manipulation.R

@@ -1270,7 +1270,8 @@ combine_tdat_design <- function(terradat_points,
 #' @param x Spatial points or polygons data frame. The geometry to restrict.
 #' @param clip_polygons Spatial polygons data frame. The geometry to restrict \code{x} to.
 #' @param scale Numeric. A value to be passed to \code{rgeos::setScale()} to use for the steps of this function. It will be returned to the previous value before the function returns its output. Defaults to \code{1e5} (precision to five decimal places).
-#' @return
+#' @export
+
 clip_rgeos <- function(x,
                        clip_polygons,
                        verbose = FALSE,