remove hydroPSO package

Author: nguyenta

R/loadPackages.R

@@ -20,8 +20,7 @@ requiredPackages <- c('foreach',         # version >= 1.5.2
                       'excelR',          # version >= 0.4.0
                       'sensitivity',     # version >= 1.27.0
                       'boot',            # version >= 1.3-24
-                      'optimization',    # version >= 1.0-9  
-                      'hydroPSO',        # version >= 0.5-1
+                      'optimization',    # version >= 1.0-9
                       'nloptr',          # version >= 2.0.0
                       'spsComps')        # version >= 0.3.2.1)
 
@@ -33,4 +32,3 @@ update.packages(requiredPackages, ask = FALSE)
 
 # Load dependency packages
 suppressMessages(suppressWarnings(lapply(requiredPackages, library, character.only = TRUE)))
-

R/paramSamplingUI.R

@@ -82,7 +82,6 @@ paramSamplingUI <- function(id) {
                                      'Sensi_(from_sensitivity_package)',
                                      'Sensi_(from_userDefined_package)',
                                      'Cali_(from_optimization_package)',
-                                     'Cali_(from_hydroPSO_package)',
                                      'Cali_(from_nloptr_package)',
                                      'Cali_(Dynamically_Dimensioned_Search)',
                                      'Cali_(Generalized_Likelihood_Uncertainty_Estimation)',

server.R

@@ -237,7 +237,6 @@ server <- function(input, output, session) {
                                       'Sensi_(from_sensitivity_package)',
                                       'Sensi_(from_userDefined_package)',
                                       'Cali_(from_optimization_package)',
-                                      'Cali_(from_hydroPSO_package)',
                                       'Cali_(from_nloptr_package)',
                                       'Cali_(Dynamically_Dimensioned_Search)',
                                       'Cali_(Generalized_Likelihood_Uncertainty_Estimation)',
@@ -989,16 +988,7 @@ server <- function(input, output, session) {
                           "nlimit = 5,t_min = 0.1, dyn_rf = FALSE,rf = 1,r = 0.7)))"))
       outputText <- helpTextCali
 
-    # From hydroPSO package
-    } else if (input$samplingApproach == 'Cali_(from_hydroPSO_package)'){
-      
-      updateTextAreaInput(session, "inputInfo", 
-                          paste("3. Additional infomation about the selected",
-                          "sensitivity/calibration approach"),
-                          paste("hydroPSO(fn = SWAT, lower=minCol, upper=maxCol,",
-                          "control=list(maxit=1))"))
-      outputText <- helpTextCali
-      
+    # From nloptr_package 
     } else if (input$samplingApproach == 'Cali_(from_nloptr_package)'){
 
       updateTextAreaInput(session, "inputInfo", 
@@ -1104,7 +1094,6 @@ server <- function(input, output, session) {
     # Check if user need to input R command
     if (input$samplingApproach == 'Sensi_(from_sensitivity_package)' |
         input$samplingApproach == 'Cali_(from_optimization_package)' |
-        input$samplingApproach == 'Cali_(from_hydroPSO_package)' |
         input$samplingApproach == 'Cali_(from_nloptr_package)' |
         input$samplingApproach == 'Sensi_(from_userDefined_package)' |
         input$samplingApproach == 'Cali_(from_userDefined_package)' ){
@@ -1989,7 +1978,6 @@ server <- function(input, output, session) {
       if (globalVariable$samplingApproach == 'Cali_(Dynamically_Dimensioned_Search)' |
           globalVariable$samplingApproach == 'Cali_(from_userDefined_package)'  |
           globalVariable$samplingApproach == 'Cali_(from_optimization_package)' |
-          globalVariable$samplingApproach == 'Cali_(from_hydroPSO_package)' |
           globalVariable$samplingApproach == 'Cali_(from_nloptr_package)' |
           globalVariable$samplingApproach == 'Sensi_(from_sensitivity_package)' |
           globalVariable$samplingApproach == 'Sensi_(from_userDefined_package)' ){

ui.R

@@ -5,7 +5,7 @@ ui <- dashboardPage(
   # ----------------------------------------------------------------------Header
   dashboardHeader(
     # Name of the app
-    title = "R-SWAT (v3.0)", 
+    title = "R-SWAT (v3.1)", 
 
     # Add two buttons in the header for saving and loading project
     tags$li(class = "dropdown",