Merge pull request #28 from SciML/Vaibhavdixit02-patch-1

More Optimization removal

Author: Vaibhavdixit02

Project.toml

@@ -1,7 +1,7 @@
 name = "OptimizationBase"
 uuid = "bca83a33-5cc9-4baa-983d-23429ab6bcbb"
 authors = ["Vaibhav Dixit <[email protected]> and contributors"]
-version = "0.0.3"
+version = "0.0.4"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

src/OptimizationBase.jl

@@ -15,10 +15,19 @@ import SciMLBase: OptimizationProblem,
     MaxSense, MinSense, OptimizationStats
 export ObjSense, MaxSense, MinSense
 
+struct NullCallback end
+(x::NullCallback)(args...) = false;
+const DEFAULT_CALLBACK = NullCallback()
+
+struct NullData end
+const DEFAULT_DATA = Iterators.cycle((NullData(),))
+Base.iterate(::NullData, i = 1) = nothing
+Base.length(::NullData) = 0
+
 include("adtypes.jl")
 include("cache.jl")
 include("function.jl")
 
-export solve, OptimizationCache
+export solve, OptimizationCache, DEFAULT_CALLBACK, DEFAULT_DATA
 
 end

src/cache.jl

@@ -15,7 +15,7 @@ struct OptimizationCache{F, RC, LB, UB, LC, UC, S, O, D, P, C} <:
 end
 
 function OptimizationCache(prob::SciMLBase.OptimizationProblem, opt, data;
-        callback = Optimization.DEFAULT_CALLBACK,
+        callback = DEFAULT_CALLBACK,
         maxiters::Union{Number, Nothing} = nothing,
         maxtime::Union{Number, Nothing} = nothing,
         abstol::Union{Number, Nothing} = nothing,
@@ -33,8 +33,8 @@ function OptimizationCache(prob::SciMLBase.OptimizationProblem, opt, data;
 end
 
 function SciMLBase.__init(prob::SciMLBase.OptimizationProblem, opt,
-        data = Optimization.DEFAULT_DATA;
-        callback = Optimization.DEFAULT_CALLBACK,
+        data = DEFAULT_DATA;
+        callback = DEFAULT_CALLBACK,
         maxiters::Union{Number, Nothing} = nothing,
         maxtime::Union{Number, Nothing} = nothing,
         abstol::Union{Number, Nothing} = nothing,