Add ArcTable.iter(i) ✨ #249

nfdi4plants · Nov 14, 2023 · 527dd5f · 527dd5f
1 parent efff208
commit 527dd5f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 4 deletions.
diff --git a/src/ISA/ISA/ArcTypes/ArcTable.fs b/src/ISA/ISA/ArcTypes/ArcTable.fs
@@ -81,6 +81,15 @@ type ArcTable(name: string, headers: ResizeArray<CompositeHeader>, values: Syste
         fun (table:ArcTable) ->
             table.TryGetCellAt(column, row)
 
+    member this.IterColumns(mapping: CompositeColumn -> unit) =
+        for columnIndex in 0 .. (this.ColumnCount-1) do
+            let column = this.GetColumn columnIndex
+            mapping column
+
+    member this.IteriColumns(mapping: int -> CompositeColumn -> unit) =
+        for columnIndex in 0 .. (this.ColumnCount-1) do
+            let column = this.GetColumn columnIndex
+            mapping columnIndex column
 
     // - Cell API - //
     // TODO: And then directly a design question. Is a column with rows containing both CompositeCell.Term and CompositeCell.Unitized allowed?

diff --git a/src/ISA/ISA/ArcTypes/ArcTables.fs b/src/ISA/ISA/ArcTypes/ArcTables.fs
@@ -51,15 +51,15 @@ module ArcTablesAux =
 
             match table.TryGetInputColumn() with
             | Some ic -> 
-                let ioType = ic.Header.tryInput().Value
+                let ioType = ic.Header.TryInput().Value
                 ic.Cells
                 |> Array.iter (fun c -> 
                     includeInMap (c.ToFreeTextCell().AsFreeText) ioType
                 )
             | None -> ()
             match table.TryGetOutputColumn() with
             | Some oc -> 
-                let ioType = oc.Header.tryOutput().Value
+                let ioType = oc.Header.TryOutput().Value
                 oc.Cells
                 |> Array.iter (fun c -> 
                     includeInMap (c.ToFreeTextCell().AsFreeText) ioType
@@ -72,7 +72,7 @@ module ArcTablesAux =
             match table.TryGetInputColumn() with
             | Some ic -> 
                 let index = table.Headers |> Seq.findIndex (fun x -> x.isInput)
-                let oldIoType = ic.Header.tryInput().Value
+                let oldIoType = ic.Header.TryInput().Value
                 let newIOType = 
                     ic.Cells
                     |> Array.fold (fun (io : IOType) c ->
@@ -85,7 +85,7 @@ module ArcTablesAux =
             match table.TryGetOutputColumn() with
             | Some oc -> 
                 let index = table.Headers |> Seq.findIndex (fun x -> x.isOutput)
-                let oldIoType = oc.Header.tryOutput().Value
+                let oldIoType = oc.Header.TryOutput().Value
                 let newIOType = 
                     oc.Cells
                     |> Array.fold (fun (io : IOType) c ->

diff --git a/tests/ISA/ISA.Tests/ArcTable.Tests.fs b/tests/ISA/ISA.Tests/ArcTable.Tests.fs
@@ -2186,6 +2186,17 @@ let private tests_Join = testList "Join" [
     ]
 ]
 
+let private tests_IterColumns = testList "IterColumns" [
+    testCase "Replace input column header" <| fun _ ->
+        let table = create_testTable()
+        let expected = CompositeHeader.Input IOType.RawDataFile
+        table.IteriColumns (fun i c ->
+            if c.Header.isInput then
+                table.UpdateHeader(i,expected)
+        )
+        Expect.equal table.Columns.[0].Header expected ""
+]
+
 let private tests_equality = testList "equality" [
     testList "override equality" [
         testCase "equal" <| fun _ ->
@@ -2244,6 +2255,7 @@ let main =
         tests_validate
         tests_UpdateRefWithSheet
         tests_Join
+        tests_IterColumns
         tests_GetHashCode
         tests_equality
     ]