obj_grad_hess: simplify mapreduce

* destructure lambda function args
* don't use zip(): mapreduce support multi-arg functions

src/objective_gradient_hessian.jl

@@ -87,9 +87,10 @@ end
 
 function objective!(loss::SemLoss, par, model)
     return mapreduce(
-        fun_weight -> fun_weight[2] * objective!(fun_weight[1], par, model),
+        (fun, weight) -> weight * objective!(fun, par, model),
         +,
-        zip(loss.functions, loss.weights),
+        loss.functions,
+        loss.weights,
     )
 end
 
@@ -108,19 +109,19 @@ end
 
 function objective_gradient!(gradient, loss::SemLoss, par, model)
     return mapreduce(
-        fun_weight ->
-            objective_gradient_wrap_(gradient, fun_weight[1], par, model, fun_weight[2]),
+        (fun, weight) -> objective_gradient_wrap_(gradient, fun, par, model, weight),
         +,
-        zip(loss.functions, loss.weights),
+        loss.functions,
+        loss.weights,
     )
 end
 
 function objective_hessian!(hessian, loss::SemLoss, par, model)
     return mapreduce(
-        fun_weight ->
-            objective_hessian_wrap_(hessian, fun_weight[1], par, model, fun_weight[2]),
+        (fun, weight) -> objective_hessian_wrap_(hessian, fun, par, model, weight),
         +,
-        zip(loss.functions, loss.weights),
+        loss.functions,
+        loss.weights,
     )
 end
 
@@ -134,16 +135,11 @@ end
 
 function objective_gradient_hessian!(gradient, hessian, loss::SemLoss, par, model)
     return mapreduce(
-        fun_weight -> objective_gradient_hessian_wrap_(
-            gradient,
-            hessian,
-            fun_weight[1],
-            par,
-            model,
-            fun_weight[2],
-        ),
+        (fun, weight) ->
+            objective_gradient_hessian_wrap_(gradient, hessian, fun, par, model, weight),
         +,
-        zip(loss.functions, loss.weights),
+        loss.functions,
+        loss.weights,
     )
 end
 
@@ -174,9 +170,10 @@ end
 
 function objective!(ensemble::SemEnsemble, par)
     return mapreduce(
-        model_weight -> model_weight[2] * objective!(model_weight[1], par),
+        (model, weight) -> weight * objective!(model, par),
         +,
-        zip(ensemble.sems, ensemble.weights),
+        ensemble.sems,
+        ensemble.weights,
     )
 end
 
@@ -201,20 +198,20 @@ end
 function objective_gradient!(gradient, ensemble::SemEnsemble, par)
     fill!(gradient, zero(eltype(gradient)))
     return mapreduce(
-        model_weight ->
-            objective_gradient_wrap_(gradient, model_weight[1], par, model_weight[2]),
+        (model, weight) -> objective_gradient_wrap_(gradient, model, par, weight),
         +,
-        zip(ensemble.sems, ensemble.weights),
+        ensemble.sems,
+        ensemble.weights,
     )
 end
 
 function objective_hessian!(hessian, ensemble::SemEnsemble, par)
     fill!(hessian, zero(eltype(hessian)))
     return mapreduce(
-        model_weight ->
-            objective_hessian_wrap_(hessian, model_weight[1], par, model_weight[2]),
+        (model, weight) -> objective_hessian_wrap_(hessian, model, par, weight),
         +,
-        zip(ensemble.sems, ensemble.weights),
+        ensemble.sems,
+        ensemble.weights,
     )
 end
 
@@ -236,16 +233,11 @@ function objective_gradient_hessian!(gradient, hessian, ensemble::SemEnsemble, p
     fill!(gradient, zero(eltype(gradient)))
     fill!(hessian, zero(eltype(hessian)))
     return mapreduce(
-        model_weight -> objective_gradient_hessian_wrap_(
-            gradient,
-            hessian,
-            model_weight[1],
-            par,
-            model,
-            model_weight[2],
-        ),
+        (model, weight) ->
+            objective_gradient_hessian_wrap_(gradient, hessian, model, par, model, weight),
         +,
-        zip(ensemble.sems, ensemble.weights),
+        ensemble.sems,
+        ensemble.weights,
     )
 end