Merge pull request #118 from RevolutionAnalytics/dev

Dev
RevolutionAnalytics · Aug 17, 2016 · 86600cd · 86600cd
2 parents d0ee0dd + fa819ca
commit 86600cd
Show file tree

Hide file tree

Showing 25 changed files with 82 additions and 75 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,4 @@
-# Generated by roxygen2: do not edit by hand
+# Generated by roxygen2 (4.1.1): do not edit by hand
 
 S3method(print,Datasets)
 S3method(print,Experiments)

diff --git a/R/wrapper.R b/R/wrapper.R
@@ -32,23 +32,26 @@
 
 # wrapperFunction <- function(){
 #   inputDF <- maml.mapInputPort(1)
-#   load('src/env.RData')
-#   if(!is.null(exportenv$..packages))
-#   {
-#     lapply(exportenv$..packages, function(pkg){
-#       if(!require(pkg, character.only = TRUE, quietly = TRUE))
-#         install.packages(pkg, 
-#                        repos = paste0('file:///', getwd(), '/src/packages'), 
-#                        lib = getwd()
-#       )
-#     })
-#     .libPaths(new = getwd())
-#     lapply(exportenv$..packages, require, 
-#            quietly = TRUE, character.only=TRUE)
+#   
+#   if(!is.element("exportenv ",search())) {
+#     load('src/env.RData')
+#     if(!is.null(exportenv$..packages)) {
+#       lapply(exportenv$..packages, function(pkg){
+#         if(!require(pkg, character.only = TRUE, quietly = TRUE))
+#           install.packages(pkg,
+#                            repos = paste0('file:///', getwd(), '/src/packages'),
+#                            lib = getwd()
+#           )
+#       })
+#       .libPaths(new = getwd())
+#       lapply(exportenv$..packages, require,
+#              quietly = TRUE, character.only=TRUE)
+#     }
+#     parent.env(exportenv) = globalenv()
+#     
+#     attach(exportenv, warn.conflicts = FALSE)
 #   }
-#   parent.env(exportenv) = globalenv()
 #   
-#   attach(exportenv, warn.conflicts = FALSE)
 #   if(..data.frame){
 #     outputDF <- as.data.frame(..fun(inputDF))
 #     colnames(outputDF) <- ..output_names
@@ -65,12 +68,12 @@
 #   maml.mapOutputPort("outputDF")
 # }
 # 
-# wrapper <- paste(as.character(body(wrapperFunction)[-1]), 
+# wrapper <- paste(as.character(body(wrapperFunction)[-1]),
 #                  collapse = "\n")
 
 ### --- End of Do not remove ---------------------------------------------------
 
-wrapper <- "inputDF <- maml.mapInputPort(1)\nload(\"src/env.RData\")\nif (!is.null(exportenv$..packages)) {\n    lapply(exportenv$..packages, function(pkg) {\n        if (!require(pkg, character.only = TRUE, quietly = TRUE)) \n            install.packages(pkg, repos = paste0(\"file:///\", getwd(), \"/src/packages\"), lib = getwd())\n    })\n    .libPaths(new = getwd())\n    lapply(exportenv$..packages, require, quietly = TRUE, character.only = TRUE)\n}\nparent.env(exportenv) = globalenv()\nattach(exportenv, warn.conflicts = FALSE)\nif (..data.frame) {\n    outputDF <- as.data.frame(..fun(inputDF))\n    colnames(outputDF) <- ..output_names\n} else {\n    outputDF <- matrix(nrow = nrow(inputDF), ncol = length(..output_names))\n    outputDF <- as.data.frame(outputDF)\n    names(outputDF) <- ..output_names\n    for (i in 1:nrow(inputDF)) {\n        outputDF[i, ] <- do.call(\"..fun\", inputDF[i, ])\n    }\n}\nmaml.mapOutputPort(\"outputDF\")"
+wrapper <- "inputDF <- maml.mapInputPort(1)\nif (!is.element(\"exportenv \", search())) {\n    load(\"src/env.RData\")\n    if (!is.null(exportenv$..packages)) {\n        lapply(exportenv$..packages, function(pkg) {\n            if (!require(pkg, character.only = TRUE, quietly = TRUE)) \n                install.packages(pkg, repos = paste0(\"file:///\", getwd(), \"/src/packages\"), lib = getwd())\n        })\n        .libPaths(new = getwd())\n        lapply(exportenv$..packages, require, quietly = TRUE, character.only = TRUE)\n    }\n    parent.env(exportenv) = globalenv()\n    attach(exportenv, warn.conflicts = FALSE)\n}\nif (..data.frame) {\n    outputDF <- as.data.frame(..fun(inputDF))\n    colnames(outputDF) <- ..output_names\n} else {\n    outputDF <- matrix(nrow = nrow(inputDF), ncol = length(..output_names))\n    outputDF <- as.data.frame(outputDF)\n    names(outputDF) <- ..output_names\n    for (i in 1:nrow(inputDF)) {\n        outputDF[i, ] <- do.call(\"..fun\", inputDF[i, ])\n    }\n}\nmaml.mapOutputPort(\"outputDF\")"
 
 
 

diff --git a/man/AzureML-deprecated.Rd b/man/AzureML-deprecated.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/azureml-defunct.R
 \name{consumeDataframe}
 \alias{consumeDataframe}

diff --git a/man/AzureML-package.Rd b/man/AzureML-package.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/azureml-package.R
 \docType{package}
 \name{AzureML-package}

diff --git a/man/consume.Rd b/man/consume.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/consume.R
 \name{consume}
 \alias{consume}

diff --git a/man/datasets.Rd b/man/datasets.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/workspace.R
 \name{datasets}
 \alias{datasets}
@@ -53,8 +53,8 @@ an R data.frame, you can alternatively filter on any variable as desired.
 \seealso{
 \code{\link{workspace}}, \code{\link{experiments}}, \code{\link{download.datasets}}
 
-Other dataset functions: \code{\link{delete.datasets}},
-  \code{\link{download.intermediate.dataset}},
-  \code{\link{upload.dataset}}, \code{\link{workspace}}
+Other dataset functions: \code{\link{delete.datasets}};
+  \code{\link{download.intermediate.dataset}};
+  \code{\link{upload.dataset}}; \code{\link{workspace}}
 }
 
diff --git a/man/delete.datasets.Rd b/man/delete.datasets.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/datasets.R
 \name{delete.datasets}
 \alias{delete.datasets}
@@ -20,8 +20,8 @@ A data frame with columns Name, Deleted, status_code indicating the HTTP status
 Delete datasets from an AzureML workspace.
 }
 \seealso{
-Other dataset functions: \code{\link{datasets}},
-  \code{\link{download.intermediate.dataset}},
-  \code{\link{upload.dataset}}, \code{\link{workspace}}
+Other dataset functions: \code{\link{datasets}};
+  \code{\link{download.intermediate.dataset}};
+  \code{\link{upload.dataset}}; \code{\link{workspace}}
 }
 
diff --git a/man/deleteWebService.Rd b/man/deleteWebService.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/deleteWebservice.R
 \name{deleteWebService}
 \alias{deleteWebService}
@@ -279,6 +279,6 @@ deleteWebService(ws, "sleepy lmer")
 \code{\link{services}} \code{\link{publishWebService}} \code{\link{updateWebService}}
 
 Other publishing functions: \code{\link{publishWebService}},
-  \code{\link{workspace}}
+  \code{\link{updateWebService}}; \code{\link{workspace}}
 }
 
diff --git a/man/discoverSchema.Rd b/man/discoverSchema.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/discover.R
 \name{discoverSchema}
 \alias{discoverSchema}
@@ -25,8 +25,9 @@ Discover the expected input to a web service specified by a web service ID ng th
 \seealso{
 \code{\link{publishWebService}} \code{\link{consume}} \code{\link{workspace}} \code{link{services}} \code{\link{endpoints}} \code{\link{endpointHelp}}
 
-Other discovery functions: \code{\link{endpointHelp}},
-  \code{\link{endpoints}}, \code{\link{services}},
+Other discovery functions: \code{\link{endpointHelp}};
+  \code{\link{endpoints}}, \code{\link{getEndpoints}};
+  \code{\link{getWebServices}}, \code{\link{services}};
   \code{\link{workspace}}
 }
 
diff --git a/man/download.datasets.Rd b/man/download.datasets.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/datasets.R
 \name{download.datasets}
 \alias{download.datasets}

diff --git a/man/download.intermediate.dataset.Rd b/man/download.intermediate.dataset.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/datasets.R
 \name{download.intermediate.dataset}
 \alias{download.intermediate.dataset}
@@ -37,11 +37,11 @@ This function can download datasets with various CSV and TSV \code{DataTypeId} (
 \seealso{
 \code{\link{workspace}}, \code{\link{datasets}}, \code{\link[utils]{read.table}} and \code{\link{download.datasets}}
 
-Other dataset functions: \code{\link{datasets}},
-  \code{\link{delete.datasets}},
-  \code{\link{upload.dataset}}, \code{\link{workspace}}
+Other dataset functions: \code{\link{datasets}};
+  \code{\link{delete.datasets}};
+  \code{\link{upload.dataset}}; \code{\link{workspace}}
 
-Other experiment functions: \code{\link{experiments}},
+Other experiment functions: \code{\link{experiments}};
   \code{\link{workspace}}
 }
 
diff --git a/man/endpointHelp.Rd b/man/endpointHelp.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/services.R
 \name{endpointHelp}
 \alias{endpointHelp}
@@ -32,8 +32,9 @@ endpointHelp(e)$definitions
 }
 }
 \seealso{
-Other discovery functions: \code{\link{discoverSchema}},
-  \code{\link{endpoints}}, \code{\link{services}},
+Other discovery functions: \code{\link{discoverSchema}};
+  \code{\link{endpoints}}, \code{\link{getEndpoints}};
+  \code{\link{getWebServices}}, \code{\link{services}};
   \code{\link{workspace}}
 }
 
diff --git a/man/endpoints.Rd b/man/endpoints.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/services.R
 \name{endpoints}
 \alias{endpoints}
@@ -65,8 +65,8 @@ getEndpoints(ws, s$Id[1])
 }
 }
 \seealso{
-Other discovery functions: \code{\link{discoverSchema}},
-  \code{\link{endpointHelp}}, \code{\link{services}},
-  \code{\link{workspace}}
+Other discovery functions: \code{\link{discoverSchema}};
+  \code{\link{endpointHelp}}; \code{\link{getWebServices}},
+  \code{\link{services}}; \code{\link{workspace}}
 }
 
diff --git a/man/experiments.Rd b/man/experiments.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/workspace.R
 \name{experiments}
 \alias{experiments}
@@ -40,7 +40,7 @@ List experiments in an AzureML workspace, optionally filtering on sample or my e
 \seealso{
 \code{\link{workspace}}, \code{\link{datasets}}, \code{\link{download.intermediate.dataset}}
 
-Other experiment functions: \code{\link{download.intermediate.dataset}},
+Other experiment functions: \code{\link{download.intermediate.dataset}};
   \code{\link{workspace}}
 }
 
diff --git a/man/getDetailsFromUrl.Rd b/man/getDetailsFromUrl.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/discover.R
 \name{getDetailsFromUrl}
 \alias{getDetailsFromUrl}

diff --git a/man/is.Dataset.Rd b/man/is.Dataset.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/methods.R
 \name{is.Dataset}
 \alias{is.Dataset}

diff --git a/man/is.Endpoint.Rd b/man/is.Endpoint.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/methods.R
 \name{is.Endpoint}
 \alias{is.Endpoint}

diff --git a/man/is.Service.Rd b/man/is.Service.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/methods.R
 \name{is.Service}
 \alias{is.Service}

diff --git a/man/is.Workspace.Rd b/man/is.Workspace.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/methods.R
 \name{is.Workspace}
 \alias{is.Workspace}

diff --git a/man/publishWebService.Rd b/man/publishWebService.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/publish.R
 \name{publishWebService}
 \alias{publishWebService}
@@ -332,7 +332,7 @@ deleteWebService(ws, "sleepy lmer")
 \seealso{
 \code{\link{endpoints}}, \code{\link{discoverSchema}}, \code{\link{consume}} and \code{\link{services}}.
 
-Other publishing functions: \code{\link{deleteWebService}},
+Other publishing functions: \code{\link{deleteWebService}};
   \code{\link{workspace}}
 }
 
diff --git a/man/read.AzureML.config.Rd b/man/read.AzureML.config.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/config.R
 \name{read.AzureML.config}
 \alias{read.AzureML.config}

diff --git a/man/refresh.Rd b/man/refresh.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/workspace.R
 \name{refresh}
 \alias{refresh}

diff --git a/man/services.Rd b/man/services.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/services.R
 \name{services}
 \alias{getWebServices}
@@ -53,8 +53,8 @@ getWebServices(ws)
 }
 }
 \seealso{
-Other discovery functions: \code{\link{discoverSchema}},
-  \code{\link{endpointHelp}}, \code{\link{endpoints}},
-  \code{\link{workspace}}
+Other discovery functions: \code{\link{discoverSchema}};
+  \code{\link{endpointHelp}}; \code{\link{endpoints}},
+  \code{\link{getEndpoints}}; \code{\link{workspace}}
 }
 
diff --git a/man/upload.dataset.Rd b/man/upload.dataset.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/datasets.R
 \name{upload.dataset}
 \alias{upload.dataset}
@@ -46,9 +46,9 @@ The AzureML API does not support uploads for _replacing_ datasets with new data
 }
 }
 \seealso{
-Other dataset functions: \code{\link{datasets}},
-  \code{\link{delete.datasets}},
-  \code{\link{download.intermediate.dataset}},
+Other dataset functions: \code{\link{datasets}};
+  \code{\link{delete.datasets}};
+  \code{\link{download.intermediate.dataset}};
   \code{\link{workspace}}
 }
 
diff --git a/man/workspace.Rd b/man/workspace.Rd
@@ -1,4 +1,4 @@
-% Generated by roxygen2: do not edit by hand
+% Generated by roxygen2 (4.1.1): do not edit by hand
 % Please edit documentation in R/workspace.R
 \name{workspace}
 \alias{workspace}
@@ -97,19 +97,21 @@ Similarly, for a workspace in Europe West:
 
 Other consumption functions: \code{\link{consume}}
 
-Other dataset functions: \code{\link{datasets}},
-  \code{\link{delete.datasets}},
-  \code{\link{download.intermediate.dataset}},
+Other dataset functions: \code{\link{datasets}};
+  \code{\link{delete.datasets}};
+  \code{\link{download.intermediate.dataset}};
   \code{\link{upload.dataset}}
 
-Other discovery functions: \code{\link{discoverSchema}},
-  \code{\link{endpointHelp}}, \code{\link{endpoints}},
+Other discovery functions: \code{\link{discoverSchema}};
+  \code{\link{endpointHelp}}; \code{\link{endpoints}},
+  \code{\link{getEndpoints}}; \code{\link{getWebServices}},
   \code{\link{services}}
 
-Other experiment functions: \code{\link{download.intermediate.dataset}},
+Other experiment functions: \code{\link{download.intermediate.dataset}};
   \code{\link{experiments}}
 
-Other publishing functions: \code{\link{deleteWebService}},
-  \code{\link{publishWebService}}
+Other publishing functions: \code{\link{deleteWebService}};
+  \code{\link{publishWebService}},
+  \code{\link{updateWebService}}
 }