fix #112

Author: jmejia8

src/optimize/optimize.jl

@@ -65,6 +65,19 @@ function optimize(
     status
 end
 
+# Handle callable objects (non-Function types) with algorithm instances
+function optimize(
+        f,
+        search_space,
+        method::AbstractAlgorithm;
+        logger::Function = (status) -> nothing,
+    )
+    # Wrap callable object into a function
+    wrapped_f = _wrap_objective_function(f)
+    # Call the standard optimize function with the wrapped function
+    optimize(wrapped_f, search_space, method; logger)
+end
+
 
 """
     optimize!(f, search_space, method;logger)
@@ -133,6 +146,19 @@ function optimize!(
     return method
 end
 
+# Handle callable objects (non-Function types) with optimize!
+function optimize!(
+        f,
+        search_space,
+        method::AbstractAlgorithm;
+        logger::Function = (status) -> nothing,
+    )
+    # Wrap callable object into a function
+    wrapped_f = _wrap_objective_function(f)
+    # Call the standard optimize! function with the wrapped function
+    optimize!(wrapped_f, search_space, method; logger)
+end
+
 
 function optimize(
         f::Function,
@@ -149,3 +175,17 @@ function optimize(
     # call optimize api
     optimize(f, problem.search_space, algo; logger)
 end
+
+function optimize(
+        f,
+        _search_space,
+        ::Type{T};
+        logger::Function = (status) -> nothing,
+        kargs...
+    ) where T <: AbstractParameters
+
+    # Wrap callable object into a function
+    wrapped_f = _wrap_objective_function(f)
+    # Call the standard optimize function with the wrapped function
+    optimize(wrapped_f, _search_space, T; logger, kargs...)
+end

src/optimize/utils.jl

@@ -83,3 +83,18 @@ function show_status(status, parameters, options)
     @info msg
     display(status)
 end
+
+
+function _wrap_objective_function(objective)
+    # Check if the object is callable with an AbstractVector argument
+    # We check with Any as a representative type
+    if !hasmethod(objective, (Any,))
+        error("The objective function should be callable object.")
+    end
+    if objective isa Function
+        return objective
+    end
+
+    args -> objective(args)
+end
+

test/optimize_api.jl

@@ -49,6 +49,39 @@
             optimize(f, [lb ub], ECA, iterations=10, verbose = true)
         end
     end
+
+    # test callable objects (issue #112)
+    struct CostFunc{T}
+        a::T
+        b::T
+    end
+
+    function (A::CostFunc)(x)
+        return A.a*length(x) + sum( x.^2 - A.b*cos.(2π*x) )
+    end
+    function test_callable_objects()
+
+        callable_object = CostFunc(2.0, 2.0)
+
+        # limits/bounds
+        bounds = BoxConstrainedSpace(lb = -5ones(2), ub = 5ones(2))
+
+        # information on the minimization problem
+        information = Information(f_optimum = 0.0)
+
+        # generic settings
+        options = Options(f_tol = 1e-5, seed = 5)
+
+        # metaheuristic used to optimize
+        algorithm = ECA(information = information, options = options)
+
+        # start the minimization process
+        result = optimize(callable_object, bounds, algorithm)
+
+        @test minimum(result) < 1e-4
+    end
+    
     test_optimize()
     search_space_optimize()
+    test_callable_objects()
 end