format files

Author: joaquimg

src/FileFormats/MOF/write.jl

@@ -95,21 +95,21 @@ function write_nlpblock(
         objective = MOI.objective_expr(nlp_block.evaluator)
         objective = _lift_variable_indices(objective)
         sense = MOI.get(model, MOI.ObjectiveSense())
-        object["objective"] = NamedTuple{(:sense, :function)}(
-            (moi_to_object(sense),
-            moi_to_object(Nonlinear(objective), name_map))
-        )
+        object["objective"] = NamedTuple{(:sense, :function)}((
+            moi_to_object(sense),
+            moi_to_object(Nonlinear(objective), name_map),
+        ))
     end
     for (row, bounds) in enumerate(nlp_block.constraint_bounds)
         constraint = MOI.constraint_expr(nlp_block.evaluator, row)
         (func, set) = extract_function_and_set(constraint)
         func = _lift_variable_indices(func)
         push!(
             object["constraints"],
-            NamedTuple{(:function, :set)}(
-            (moi_to_object(Nonlinear(func), name_map),
-            moi_to_object(set, name_map),)
-            )
+            NamedTuple{(:function, :set)}((
+                moi_to_object(Nonlinear(func), name_map),
+                moi_to_object(set, name_map),
+            )),
         )
     end
     return
@@ -247,10 +247,7 @@ function _convert_nonlinear_to_mof(
 )
     node = (type = string(f.head), args = Any[])
     for arg in f.args
-        push!(
-            node[:args],
-            _convert_nonlinear_to_mof(arg, node_list, name_map),
-        )
+        push!(node[:args], _convert_nonlinear_to_mof(arg, node_list, name_map))
     end
     push!(node_list, node)
     return (type = "node", index = length(node_list))
@@ -294,8 +291,7 @@ end
 
 function moi_to_object(foo::Nonlinear, name_map::Dict{MOI.VariableIndex,String})
     node_list = Any[]
-    root =
-        _convert_nonlinear_to_mof(foo.expr, node_list, name_map)
+    root = _convert_nonlinear_to_mof(foo.expr, node_list, name_map)
     return (
         type = "ScalarNonlinearFunction",
         root = root,
@@ -322,10 +318,7 @@ function moi_to_object(
     foo::MOI.ScalarAffineTerm,
     name_map::Dict{MOI.VariableIndex,String},
 )
-    return (
-        coefficient = foo.coefficient,
-        variable = name_map[foo.variable],
-    )
+    return (coefficient = foo.coefficient, variable = name_map[foo.variable])
 end
 
 function moi_to_object(
@@ -536,10 +529,7 @@ function moi_to_object(
     set::MOI.Reified,
     name_map::Dict{MOI.VariableIndex,String},
 )
-    return (
-        type = "Reified",
-        set = moi_to_object(set.set, name_map),
-    )
+    return (type = "Reified", set = moi_to_object(set.set, name_map))
 end
 
 function moi_to_object(
@@ -556,8 +546,5 @@ function moi_to_object(
     set::MOI.Scaled,
     name_map::Dict{MOI.VariableIndex,String},
 )
-    return (
-        type = "Scaled",
-        set = moi_to_object(set.set, name_map),
-    )
+    return (type = "Scaled", set = moi_to_object(set.set, name_map))
 end

test/FileFormats/MOF/MOF.jl

@@ -307,11 +307,7 @@ function test_Roundtrip_nonlinear_expressions()
         :(ifelse($x > 0, 1, $y)),
     ]
         node_list = Any[]
-        object = MOF._convert_nonlinear_to_mof(
-            expr,
-            node_list,
-            var_to_string,
-        )
+        object = MOF._convert_nonlinear_to_mof(expr, node_list, var_to_string)
         @test _convert_mof_to_expr(object, node_list, string_to_var) == expr
     end
     return
@@ -381,8 +377,7 @@ function test_Blank_variable_name()
     variable = MOI.add_variable(model)
     @test_throws Exception MOF.moi_to_object(variable, model)
     MOI.FileFormats.create_unique_names(model, warn = true)
-    @test MOF.moi_to_object(variable, model) ==
-        (name = "x1",)
+    @test MOF.moi_to_object(variable, model) == (name = "x1",)
 end
 
 function test_Duplicate_variable_name()
@@ -1486,14 +1481,9 @@ function test_integer_coefficients()
     f = 2 * x * x + 3 * x + 4
     @test MOF.moi_to_object(f, names) == (
         type = "ScalarQuadraticFunction",
-        affine_terms =
-            [(coefficient = 3, variable = "x")],
+        affine_terms = [(coefficient = 3, variable = "x")],
         quadratic_terms = [
-            (
-                coefficient = 4,
-                variable_1 = "x",
-                variable_2 = "x",
-            ),
+            (coefficient = 4, variable_1 = "x", variable_2 = "x"),
         ],
         constant = 4,
     )
@@ -1542,20 +1532,8 @@ function test_mof_scalaraffinefunction()
         root = (type = "node", index = 3),
         node_list = Any[
             (type = "*", args = [1.0, "x"]),
-            (
-                type = "+",
-                args = [
-                    (type = "node", index = 1),
-                    2.0,
-                ],
-            ),
-            (
-                type = "log",
-                args = Any[(
-                    type = "node",
-                    index = 2,
-                )],
-            ),
+            (type = "+", args = [(type = "node", index = 1), 2.0]),
+            (type = "log", args = Any[(type = "node", index = 2)]),
         ],
     )
     @test object == object_dest
@@ -1573,20 +1551,8 @@ function test_mof_scalarquadraticfunction()
         root = (type = "node", index = 3),
         node_list = Any[
             (type = "*", args = [1.0, "x", "x"]),
-            (
-                type = "+",
-                args = [
-                    (type = "node", index = 1),
-                    2.0,
-                ],
-            ),
-            (
-                type = "log",
-                args = Any[(
-                    type = "node",
-                    index = 2,
-                )],
-            ),
+            (type = "+", args = [(type = "node", index = 1), 2.0]),
+            (type = "log", args = Any[(type = "node", index = 2)]),
         ],
     )
     @test object == object_dest