update vignette and to-do

aaronrkaufman · Jul 23, 2018 · cd4c067 · cd4c067
1 parent 12a8c68
commit cd4c067
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/TO-DO b/TO-DO
@@ -6,6 +6,5 @@ USEFUL
 
 
 CRITICAL
--test orphaned hole fix
 -figure out how to handle Alaksa
 -fix vignette code
diff --git a/vignettes/build_models.R b/vignettes/build_models.R
@@ -4,34 +4,33 @@
 setwd("D:/GitHub/compactness_software/data")
 
 ## Required libraries
-library(sp)
-library(sf)
-library(rgdal)
-library(raster)
-library(rgeos)
-library(png)
-library(pracma)
-library(jpeg)
-library(imager)
-library(geosphere)
-library(shotGroups)
-library(RcppRoll)
-library(gbm)
-library(randomForest)
-library(e1071)
-
-source("../R/generate_features.R")
-source("../R/read_shapefiles.R")
-source("../R/feature_helpers.R")
+# library(sp)
+# library(sf)
+# library(rgdal)
+# library(raster)
+# library(rgeos)
+# library(png)
+# library(pracma)
+# library(jpeg)
+# library(imager)
+# library(geosphere)
+# library(shotGroups)
+# library(RcppRoll)
+# library(gbm)
+# library(randomForest)
+# library(e1071)
+# source("../R/generate_features.R")
+# source("../R/read_shapefiles.R")
+# source("../R/feature_helpers.R")
+library(compactness)
 
 load("D:/GitHub/compactness_software/data/training_data.RData")
 
 # Load training labels with old features
 df = do.call(rbind, mylist)
 
-
 # Read in the from shapefiles
-sl = "D:/Dropbox/Compactness Shared/Data/Other Shapefiles/both.shp" # is this all I need?
+sl = "D:/Dropbox/Compactness Shared/Data/Other Shapefiles/both.shp" # state legislative shapefiles
 namecol = "NAME"
 shp = read_shapefiles(sl, namecol)