Run formatter

Author: ArneBouillon

src/Emulator.jl

@@ -146,22 +146,16 @@ function Emulator(
 
     encoder_schedule = create_encoder_schedule(encoder_schedule)
     (encoded_io_pairs, input_structure_mats, output_structure_mats, _, _) =
-        initialize_and_encode_with_schedule!(
-            encoder_schedule,
-            input_output_pairs;
-            obs_noise_cov,
-            encoder_kwargs...,
-        )
+        initialize_and_encode_with_schedule!(encoder_schedule, input_output_pairs; obs_noise_cov, encoder_kwargs...)
 
     # build the machine learning tool in the encoded space
-    build_models!(
+    build_models!(machine_learning_tool, encoded_io_pairs, input_structure_mats, output_structure_mats; mlt_kwargs...)
+    return Emulator{FT, typeof(encoder_schedule)}(
         machine_learning_tool,
+        input_output_pairs,
         encoded_io_pairs,
-        input_structure_mats,
-        output_structure_mats;
-        mlt_kwargs...,
+        encoder_schedule,
     )
-    return Emulator{FT, typeof(encoder_schedule)}(machine_learning_tool, input_output_pairs, encoded_io_pairs, encoder_schedule)
 end
 
 """

src/Utilities.jl

@@ -86,7 +86,11 @@ function get_structure_vec(structure_vecs, name = nothing)
         elseif isempty(structure_vecs)
             throw(ArgumentError("Please provide a structure vector."))
         else
-            throw(ArgumentError("Structure vectors $(collect(keys(structure_vecs))) are present. Please indicate which to use."))
+            throw(
+                ArgumentError(
+                    "Structure vectors $(collect(keys(structure_vecs))) are present. Please indicate which to use.",
+                ),
+            )
         end
     else
         if haskey(structure_vecs, name)
@@ -104,7 +108,11 @@ function get_structure_mat(structure_mats, name = nothing)
         elseif isempty(structure_mats)
             throw(ArgumentError("Please provide a structure matrix."))
         else
-            throw(ArgumentError("Structure matrices $(collect(keys(structure_mats))) are present. Please indicate which to use."))
+            throw(
+                ArgumentError(
+                    "Structure matrices $(collect(keys(structure_mats))) are present. Please indicate which to use.",
+                ),
+            )
         end
     else
         if haskey(structure_mats, name)
@@ -268,14 +276,20 @@ function initialize_and_encode_with_schedule!(
         )
 
         if apply_to == "in"
-            input_structure_mats =
-                Dict{Symbol, StructureMatrix}(name => encode_structure_matrix(processor, mat) for (name, mat) in input_structure_mats)
-            input_structure_vecs = Dict{Symbol, StructureVector}(name => encode_data(processor, vec) for (name, vec) in input_structure_vecs)
+            input_structure_mats = Dict{Symbol, StructureMatrix}(
+                name => encode_structure_matrix(processor, mat) for (name, mat) in input_structure_mats
+            )
+            input_structure_vecs = Dict{Symbol, StructureVector}(
+                name => encode_data(processor, vec) for (name, vec) in input_structure_vecs
+            )
             processed_io_pairs = PairedDataContainer(processed, get_outputs(processed_io_pairs))
         elseif apply_to == "out"
-            output_structure_mats =
-                Dict{Symbol, StructureMatrix}(name => encode_structure_matrix(processor, mat) for (name, mat) in output_structure_mats)
-            output_structure_vecs = Dict{Symbol, StructureVector}(name => encode_data(processor, vec) for (name, vec) in output_structure_vecs)
+            output_structure_mats = Dict{Symbol, StructureMatrix}(
+                name => encode_structure_matrix(processor, mat) for (name, mat) in output_structure_mats
+            )
+            output_structure_vecs = Dict{Symbol, StructureVector}(
+                name => encode_data(processor, vec) for (name, vec) in output_structure_vecs
+            )
             processed_io_pairs = PairedDataContainer(get_inputs(processed_io_pairs), processed)
         end
     end

test/MarkovChainMonteCarlo/runtests.jl

@@ -100,8 +100,7 @@ function test_gp_and_agp_1(y, σ2_y, iopairs::PairedDataContainer)
         ) for model_params in gp_opt_params
     ]
 
-    em_agp =
-        Emulator(agp, iopairs, (obs_noise_cov = σ2_y,); encoder_schedule = [], kernel_params = kernel_params)
+    em_agp = Emulator(agp, iopairs, (obs_noise_cov = σ2_y,); encoder_schedule = [], kernel_params = kernel_params)
 
     return em, em_agp
 end

test/Utilities/runtests.jl

@@ -145,8 +145,12 @@ end
         (encoded_io_pairs, encoded_input_structure_mats, encoded_output_structure_mats, _, _) =
             initialize_and_encode_with_schedule!(encoder_schedule, io_pairs; prior_cov, obs_noise_cov)
 
-        (decoded_io_pairs, decoded_input_structure_mat, decoded_output_structure_mat) =
-            decode_with_schedule(encoder_schedule, encoded_io_pairs, encoded_input_structure_mats[:prior_cov], encoded_output_structure_mats[:obs_noise_cov])
+        (decoded_io_pairs, decoded_input_structure_mat, decoded_output_structure_mat) = decode_with_schedule(
+            encoder_schedule,
+            encoded_io_pairs,
+            encoded_input_structure_mats[:prior_cov],
+            encoded_output_structure_mats[:obs_noise_cov],
+        )
         for (enc_dat, dec_dat, test_dat, enc_covv, dec_covv, test_covv, dim) in zip(
             (get_inputs(encoded_io_pairs), get_outputs(encoded_io_pairs)),
             (get_inputs(decoded_io_pairs), get_outputs(decoded_io_pairs)),