Adapt tests to new functions

Author: ArneBouillon

src/Emulator.jl

@@ -174,7 +174,12 @@ function Emulator(
 
     enc_schedule = create_encoder_schedule(encoder_schedule)
     (encoded_io_pairs, encoded_input_structure_mat, encoded_output_structure_mat) =
-        encode_with_schedule!(enc_schedule, input_output_pairs, input_structure_mat, output_structure_mat)
+        initialize_and_encode_with_schedule!(
+            enc_schedule,
+            input_output_pairs,
+            input_structure_mat,
+            output_structure_mat,
+        )
 
     # build the machine learning tool in the encoded space
     build_models!(

src/Utilities.jl

@@ -14,7 +14,14 @@ using ..DataContainers
 export get_training_points
 
 export PairedDataContainerProcessor, DataContainerProcessor
-export create_encoder_schedule, initialize_and_encode_with_schedule!, encode_with_schedule, decode_with_schedule
+export create_encoder_schedule,
+    initialize_and_encode_with_schedule!,
+    encode_with_schedule,
+    decode_with_schedule,
+    encode_data,
+    encode_structure_matrix,
+    decode_data,
+    decode_structure_matrix
 
 
 
@@ -101,7 +108,7 @@ function _initialize_and_encode_data!(
     apply_to::AS,
 ) where {P <: DataProcessor, AS <: AbstractString}
     if proc isa PairedDataContainerProcessor
-        initialize_processor!(proc, data..., structure_mats..., apply_to)
+        initialize_processor!(proc, get_data(data)..., structure_mats..., apply_to)
     else
         input_data, output_data = get_data(data)
         input_structure_mat, output_structure_mat = structure_mats
@@ -250,7 +257,7 @@ function encode_with_schedule(
     structure_matrix::USorM,
     in_or_out::AS,
 ) where {VV <: AbstractVector, USorM <: Union{UniformScaling, AbstractMatrix}, AS <: AbstractString}
-    if !(in_or_out ∈ ["in", "out"])
+    if in_or_out ∉ ["in", "out"]
         bad_in_or_out(in_or_out)
     end
     processed_structure_matrix = deepcopy(structure_matrix)

test/Emulator/runtests.jl

@@ -44,11 +44,11 @@ struct MLTester <: Emulators.MachineLearningTool end
     @test get_io_pairs(em) == io_pairs
     default_encoder = (decorrelate_sample_cov(), "in_and_out") # for these inputs this is the default
     enc_sch = create_encoder_schedule(default_encoder)
-    enc_io_pairs, enc_I_in, enc_I_out = encode_with_schedule!(enc_sch, io_pairs, 1.0 * I(p), 1.0 * I(d))
+    enc_io_pairs, enc_I_in, enc_I_out = initialize_and_encode_with_schedule!(enc_sch, io_pairs, 1.0 * I(p), 1.0 * I(d))
     @test get_encoder_schedule(em)[1][1] == enc_sch[1][1] # inputs: proc
-    @test get_encoder_schedule(em)[1][3] == enc_sch[1][3] # inputs: apply_to
+    @test get_encoder_schedule(em)[1][2] == enc_sch[1][2] # inputs: apply_to
     @test get_encoder_schedule(em)[2][1] == enc_sch[2][1] # outputs...
-    @test get_encoder_schedule(em)[2][3] == enc_sch[2][3]
+    @test get_encoder_schedule(em)[2][2] == enc_sch[2][2]
     @test get_data(get_encoded_io_pairs(em)) == get_data(enc_io_pairs)
     @test get_data(get_encoded_io_pairs(em)) == get_data(enc_io_pairs)
 
@@ -91,23 +91,23 @@ struct MLTester <: Emulators.MachineLearningTool end
     enc_sch1 = create_encoder_schedule([(decorrelate_sample_cov(), "in"), (decorrelate_structure_mat(), "out")])
     enc_sch2 = create_encoder_schedule([(decorrelate_structure_mat(), "in"), (decorrelate_structure_mat(), "out")])
     enc_sch3 = create_encoder_schedule([(decorrelate_structure_mat(), "in"), (decorrelate_sample_cov(), "out")])
-    (_, _, _) = encode_with_schedule!(
+    (_, _, _) = initialize_and_encode_with_schedule!(
         enc_sch1,
         io_pairs,
         1.0 * I(p),
         Σ, # obs noise cov becomes the output structure matrix
     )
     @test get_encoder_schedule(em1) == enc_sch1
 
-    (_, _, _) = encode_with_schedule!(
+    (_, _, _) = initialize_and_encode_with_schedule!(
         enc_sch2,
         io_pairs,
         4.0 * I(p),
         2.0 * I(d), # out_struct_mat overrides obs noise cov
     )
     @test get_encoder_schedule(em2) == enc_sch2
 
-    (_, _, _) = encode_with_schedule!(enc_sch3, io_pairs, Γ, I(d))
+    (_, _, _) = initialize_and_encode_with_schedule!(enc_sch3, io_pairs, Γ, I(d))
     @test get_encoder_schedule(em3) == enc_sch3
 
 end

test/Utilities/runtests.jl

@@ -143,7 +143,7 @@ end
     for (name, sch, ll_flag) in zip(test_names, schedules, lossless)
         encoder_schedule = create_encoder_schedule(sch)
         (encoded_io_pairs, encoded_prior_cov, encoded_obs_noise_cov) =
-            encode_with_schedule!(encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
+            initialize_and_encode_with_schedule!(encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
 
         (decoded_io_pairs, decoded_prior_cov, decoded_obs_noise_cov) =
             decode_with_schedule(encoder_schedule, encoded_io_pairs, encoded_prior_cov, encoded_obs_noise_cov)
@@ -293,18 +293,21 @@ end
 
     @test_logs (:warn,) create_encoder_schedule((canonical_correlation(), "bad"))
     @test_logs (:warn,) create_encoder_schedule((zscore_scale(), "bad"))
-    func = x -> (get_inputs(x), get_outputs(x))
-    bad_encoder_schedule = [(canonical_correlation(), func, "bad")]
-    @test_throws ArgumentError encode_with_schedule!(bad_encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
+    bad_encoder_schedule = [(canonical_correlation(), "bad")]
+    @test_throws ArgumentError initialize_and_encode_with_schedule!(
+        bad_encoder_schedule,
+        io_pairs,
+        prior_cov,
+        obs_noise_cov,
+    )
     @test_throws ArgumentError decode_with_schedule(bad_encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
-    @test_throws ArgumentError decode_data(canonical_correlation(), func(io_pairs), "bad")
 
 
     encoder_schedule = create_encoder_schedule(schedule_builder)
 
     # encode the data using the schedule
     (encoded_io_pairs, encoded_prior_cov, encoded_obs_noise_cov) =
-        encode_with_schedule!(encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
+        initialize_and_encode_with_schedule!(encoder_schedule, io_pairs, prior_cov, obs_noise_cov)
 
     # decode the data using the schedule
     (decoded_io_pairs, decoded_prior_cov, decoded_obs_noise_cov) =