let go on julia 1.1

SolverStoppingJulia · Mar 5, 2021 · 1ea3c67 · 1ea3c67
1 parent c8148d9
commit 1ea3c67
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,8 @@ os:
   - osx
   #- windows
 julia:
-  - 1.1 #Long-term support (LTS) release: v1.0.5 (Sep 9, 2019)
+#  - 1.1 #Long-term support (LTS) release: v1.0.5 (Sep 9, 2019)
+  - 1.3
   - 1.5
   #- nightly
 notifications:

diff --git a/src/Stopping/GenericStoppingmod.jl b/src/Stopping/GenericStoppingmod.jl
@@ -96,7 +96,7 @@ function GenericStopping(pb            :: Pb,
                                   M  <: AbstractStoppingMeta,
                                   T  <: AbstractState}
 
-  stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+  stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return GenericStopping(pb, meta, stop_remote, current_state, 
                         main_stp, list, stopping_user_struct)
@@ -111,7 +111,7 @@ function GenericStopping(pb            :: Pb,
                          ) where {Pb <: Any, T <: AbstractState}
 
   meta = StoppingMeta(; kwargs...)
-  stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+  stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return GenericStopping(pb, meta, stop_remote, current_state, 
                         main_stp, list, stopping_user_struct)

diff --git a/src/Stopping/LinearAlgebraStopping.jl b/src/Stopping/LinearAlgebraStopping.jl
@@ -91,7 +91,7 @@ See also GenericStopping, NLPStopping, LS\\_Stopping, linear\\_system\\_check, n
                               M  <: AbstractStoppingMeta,
                               T  <: AbstractState}
 
-  stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+  stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return LAStopping(pb, meta, stop_remote, current_state, 
                     main_stp, list, stopping_user_struct, zero_start)
@@ -120,7 +120,7 @@ See also GenericStopping, NLPStopping, LS\\_Stopping, linear\\_system\\_check, n
   end
 
   meta = StoppingMeta(;max_cntrs =  mcntrs, optimality_check = oc, kwargs...)
-  stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+  stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return LAStopping(pb, meta, stop_remote, current_state, 
                     main_stp, list, stopping_user_struct, zero_start)

diff --git a/src/Stopping/NLPStoppingmod.jl b/src/Stopping/NLPStoppingmod.jl
@@ -81,7 +81,7 @@ function NLPStopping(pb             :: Pb,
                               M  <: AbstractStoppingMeta,
                               T  <: AbstractState}
 
-  stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+  stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return NLPStopping(pb, meta, stop_remote, current_state, 
                      main_stp, list, stopping_user_struct)
@@ -108,7 +108,7 @@ function NLPStopping(pb             :: Pb,
   end
 
     meta = StoppingMeta(;max_cntrs = mcntrs, optimality_check = oc, kwargs...)
-    stop_remote = StopRemoteControl() #main_stp == nothing ? StopRemoteControl() : cheap_stop_remote_control()
+    stop_remote = StopRemoteControl() #main_stp == VoidStopping() ? StopRemoteControl() : cheap_stop_remote_control()
 
   return NLPStopping(pb, meta, stop_remote, current_state, 
                      main_stp, list, stopping_user_struct)