Merge pull request #16 from Herb-AI/fix_name_problem_index

name also passed to subproblem when indexing the vector of IOExamples
Herb-AI · Nov 14, 2024 · eef2222 · eef2222 · ReubenJ · Nov 14, 2024
2 parents f1e4a30 + 1382891
commit eef2222
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "HerbSpecification"
 uuid = "6d54aada-062f-46d8-85cf-a1ceaf058a06"
 authors = ["Tilman Hinnerichs <[email protected]>"]
-version = "0.1.0"
+version = "0.1.1"
 
 [deps]
 

diff --git a/src/problem.jl b/src/problem.jl
@@ -98,7 +98,7 @@ end
 
 Overwrite `Base.getindex` to allow for slicing of input/output-based problems.
 """
-Base.getindex(p::Problem{Vector{IOExample}}, indices) = Problem(p.spec[indices])
-Base.getindex(p::MetricProblem{Vector{IOExample}}, indices) = MetricProblem(p.cost_function, p.spec[indices])
+Base.getindex(p::Problem{Vector{IOExample}}, indices) = Problem(p.name, p.spec[indices])
+Base.getindex(p::MetricProblem{Vector{IOExample}}, indices) = MetricProblem(p.name, p.cost_function, p.spec[indices])
 
 
diff --git a/test/test_ioproblem.jl b/test/test_ioproblem.jl
@@ -28,6 +28,14 @@ end
         @test problem1.name == ""
         @test problem1.spec === spec
 
+        if spec isa Vector{<:IOExample}
+            # Test getindex
+            subproblem = problem1[1:2]
+            @test isa(subproblem, Problem)
+            @test subproblem.spec == spec[1:2]
+            @test subproblem.name == ""
+        end
+
         # Test constructor with a name
         problem_name = "Test Problem"
         problem2 = Problem(problem_name, spec)
@@ -39,7 +47,7 @@ end
             subproblem = problem2[1:2]
             @test isa(subproblem, Problem)
             @test subproblem.spec == spec[1:2]
-            @test subproblem.name == ""
+            @test subproblem.name == problem_name
         end
     end
 end
@@ -67,10 +75,17 @@ end
     @test metric2.spec === spec
     @test metric2.cost_function === cost_function
 
-    # Test getindex
-    submetric = metric2[1:2]
-    @test isa(submetric, MetricProblem)
-    @test submetric.spec == spec[1:2]
-    @test submetric.name == ""
-    @test submetric.cost_function === cost_function
+    # Test getindex without name
+    submetric1 = metric1[1:2]
+    @test isa(submetric1, MetricProblem)
+    @test submetric1.spec == spec[1:2]
+    @test submetric1.name == ""
+    @test submetric1.cost_function === cost_function
+
+    # Test getindex with name
+    submetric2 = metric2[2:3]
+    @test isa(submetric2, MetricProblem)
+    @test submetric2.spec == spec[2:3]
+    @test submetric2.name == name
+    @test submetric2.cost_function === cost_function    
 end