Merge branch 'docs-updates' into 'master'

issue #34 fixed

See merge request !23

rscripts/process_ships.R

@@ -209,15 +209,11 @@ for ( year in my_args[1]:my_args[2] ) {
     # finished date processing
     #--------------------------------------------
     #cat('about to homog',"\n")
-  source("/home/users/ekent01/nocgit/icoads.utils/R/homog_ids.R")
-  #mdata<-icoads.utils::homog_ids(mdata)
-  mdata<-homog_ids(mdata)
+  mdata<-icoads.utils::homog_ids(mdata)
   if ( length(mdata$uid[duplicated(mdata$uid)]) > 0 ) stop("after homog")
   if ( print.comm ) cat("homogenised IDs","\n")
   #cat('about to add shipnames',"\n")
-  #mdata<-icoads.utils::add_shipnames(mdata)
-  source("/home/users/ekent01/nocgit/icoads.utils/R/add_shipnames.R")
-  mdata<-add_shipnames(mdata)
+  mdata<-icoads.utils::add_shipnames(mdata)
   if ( length(mdata$uid[duplicated(mdata$uid)]) > 0 ) stop("after shipname")
   if ( print.comm ) cat("added shipnames","\n")
   #cat('added shipnames',"\n")