Urban opt50

Dockerfile

@@ -80,6 +80,9 @@ ENV OS_BUNDLER_VERSION=2.1.0
 # Set the rails env var
 ENV RAILS_ENV $rails_env
 
+# extension gem testing
+#ENV FAVOR_LOCAL_GEMS 1
+
 #### OpenStudio Server Code
 # First upload the Gemfile* so that it can cache the Gems -- do this first because it is slow
 ADD /bin /opt/openstudio/bin
@@ -156,4 +159,4 @@ RUN chmod +x /usr/local/bin/run-server-tests
 
 # Test adding the git repo to the container for coveralls
 # The #TEST# will be removed in the travis test script to be run in the test container
-#TEST#COPY .git /opt/openstudio/.git
+#TEST#COPY .git /opt/openstudio/.git

appveyor.yml

@@ -11,8 +11,8 @@ artifacts:
   - path: 'export/*.tar.gz' #relative to root of repo
     name: oss.tar.gz
 
-# init:
-    # - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#init:
+#     - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 
 clone_folder: C:\projects\openstudio-server
 
@@ -35,6 +35,6 @@ test_script:
   - cmd: C:\projects\openstudio-server\ci\appveyor\build_package.cmd #artifact upload occurs before on_finish
 on_finish:
   - cmd: C:\projects\openstudio-server\ci\appveyor\print_logs.cmd
-  # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 on_failure:
   - cmd: C:\projects\openstudio-server\ci\appveyor\print_logs.cmd

docker/R/lib/api_create_datapoint.rb

@@ -107,8 +107,14 @@
 
                 # load in the objective functions by accessing the objectives file
                 # that were uploaded when the datapoint completed
+               begin 
                 a = RestClient.post "#{options[:host]}/data_points/#{datapoint_id}/download_report.json", data_point: { filename: 'objectives' }
-                a = JSON.parse(a, symbolize_names: true)
+               rescue => e
+                puts "error #{e.message}"
+                break  #at this point, simulation completed normal, but objectives failed, so dont try again.  break and be done with it.
+               end
+
+               a = JSON.parse(a, symbolize_names: true)
                 # JSON will be form of:
                 # {
                 #     "objective_function_1": 24.125,

docker/R/lib/create_and_run_datapoint_uniquegroups.R

@@ -43,7 +43,7 @@
 #   rails_analysis_id
 #   ruby_command
 #   r_scripts_path
-create_and_run_datapoint_uniquegroups <- function(x){
+create_and_run_datapoint <- function(x){
   options(warn=-1)
   if (check_run_flag(r_scripts_path, rails_host, rails_analysis_id, debug_messages)==FALSE){
     options(warn=0)
@@ -53,7 +53,7 @@ create_and_run_datapoint_uniquegroups <- function(x){
   # convert the vector to comma separated values
   force(x)
   w <- paste(x, collapse=",") 
-  y <- paste(r_scripts_path,'/api_create_datapoint.rb -h ',rails_host,' -a ',rails_analysis_id,' -v ',w,' --submit',sep='')
+  y <- paste(r_scripts_path,'/api_create_datapoint.rb -h ',rails_host,' -a ',rails_analysis_id,' -v ',w,' --submit', sep='')
   if(debug_messages == 1){
     print(paste('run command: ruby ', y))
   }