Merge branch 'main' into NickC

ices-eg · Nov 16, 2021 · 521deea · 521deea
2 parents 4cdb281 + de15a07
commit 521deea
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 6,395 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,2 +1,3 @@
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^WKBIOPTIM4\.Rproj$
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,8 @@
 .Rproj.user
+.Rproj
+^.*\.Rproj$
+^\.Rproj\.user$
 .Rhistory
 .RData
 .Ruserdata
+WKBIOPTIM4.Rproj
diff --git a/R/isa.r b/R/isa.r
@@ -0,0 +1 @@
+isabella trial
diff --git a/R/test.R b/R/test.R
diff --git a/R/test_new.R b/R/test_new.R
@@ -0,0 +1 @@
+# tests
diff --git a/inst/SampleOptim/1_Data_exploratory_analysis.R b/inst/SampleOptim/1_Data_exploratory_analysis.R