Update

Author: odow

src/FileFormats/NL/read.jl

@@ -439,9 +439,19 @@ end
 function _parse_section(io::IO, ::Val{'S'}, model::_CacheModel)
     k = _next(Int, io, model)
     n = _next(Int, io, model)
-    suffix = readline(io)
-    @warn("Skipping suffix: `S$k $n$suffix`")
+    suffix_name = if model.is_binary
+        len = _next(Int, io, model)
+        String(read(io, len))
+    else
+        strip(readline(io))
+    end
+    @warn("Skipping suffix: `S$k $n $suffix_name`")
+    # The “4” bit of k indicates whether the suffix is real (i.e., double) valued
+    # or integer valued: (k&4) != 0 --> real valued.
+    T = ifelse(k & 4 != 0, Float64, Int)
     for _ in 1:n
+        _ = _next(Int, io, model)
+        _ = _next(T, io, model)
         _read_til_newline(io, model)
     end
     return

test/FileFormats/NL/read.jl

@@ -573,14 +573,14 @@ function test_parse_S()
         io,
         """
         S0 8 zork
-        02
-        16
-        27
-        38
-        49
-        53
-        65
-        84
+        0 2
+        1 6
+        2 7
+        3 8
+        4 9
+        5 3
+        6 5
+        8 4
         """,
     )
     seekstart(io)
@@ -592,6 +592,32 @@ function test_parse_S()
     return
 end
 
+function test_parse_S_Float64()
+    model = NL._CacheModel()
+    io = IOBuffer()
+    write(
+        io,
+        """
+        S4 8 zork
+        0 2.0
+        1 6.0
+        2 7.0
+        3 8.0
+        4 9.0
+        5 3.0
+        6 5.0
+        8 4.0
+        """,
+    )
+    seekstart(io)
+    @test_logs(
+        (:warn, "Skipping suffix: `S4 8 zork`"),
+        NL._parse_section(io, model),
+    )
+    @test eof(io)
+    return
+end
+
 function test_hs071()
     model = NL.Model()
     open(joinpath(@__DIR__, "data", "hs071.nl"), "r") do io
@@ -880,14 +906,14 @@ function test_binary_parse_O()
     model.is_binary = true
     NL._resize_variables(model, 4)
     io = IOBuffer()
-    write(io, Char('O'), Int32(0), Int32(0))
-    write(io, Char('o'), Int32(2))
-    write(io, Char('v'), Int32(0))
-    write(io, Char('o'), Int32(2))
-    write(io, Char('v'), Int32(2))
-    write(io, Char('o'), Int32(2))
-    write(io, Char('v'), Int32(3))
-    write(io, Char('v'), Int32(1))
+    write(io, Cchar('O'), Int32(0), Int32(0))
+    write(io, Cchar('o'), Int32(2))
+    write(io, Cchar('v'), Int32(0))
+    write(io, Cchar('o'), Int32(2))
+    write(io, Cchar('v'), Int32(2))
+    write(io, Cchar('o'), Int32(2))
+    write(io, Cchar('v'), Int32(3))
+    write(io, Cchar('v'), Int32(1))
     seekstart(io)
     NL._parse_section(io, model)
     @test eof(io)
@@ -902,7 +928,7 @@ function test_binary_parse_O_max()
     model.is_binary = true
     NL._resize_variables(model, 4)
     io = IOBuffer()
-    write(io, Char('O'), Int32(0), Int32(1), Char('v'), Int32(0))
+    write(io, Cchar('O'), Int32(0), Int32(1), Cchar('v'), Int32(0))
     seekstart(io)
     NL._parse_section(io, model)
     @test eof(io)
@@ -917,7 +943,7 @@ function test_binary_parse_x()
     model.is_binary = true
     NL._resize_variables(model, 5)
     io = IOBuffer()
-    write(io, Char('x'), Int32(3))
+    write(io, Cchar('x'), Int32(3))
     write(io, Int32(0), 1.1)
     write(io, Int32(3), 2.2)
     write(io, Int32(2), 3.3)
@@ -932,7 +958,7 @@ function test_parse_d()
     model = NL._CacheModel()
     model.is_binary = true
     io = IOBuffer()
-    write(io, Char('d'), Int32(3))
+    write(io, Cchar('d'), Int32(3))
     write(io, Int32(0), 1.1)
     write(io, Int32(3), 2.2)
     write(io, Int32(2), 3.3)
@@ -947,7 +973,7 @@ function test_binary_parse_r()
     model.is_binary = true
     NL._resize_constraints(model, 5)
     io = IOBuffer()
-    write(io, Char('r'))
+    write(io, Cchar('r'))
     write(io, Cchar('1'), 3.3)
     write(io, Cchar('3'))
     write(io, Cchar('0'), 1.1, 2.2)
@@ -966,7 +992,7 @@ function test_binary_parse_b()
     model.is_binary = true
     NL._resize_variables(model, 5)
     io = IOBuffer()
-    write(io, Char('b'))
+    write(io, Cchar('b'))
     write(io, Cchar('1'), 3.3)
     write(io, Cchar('3'))
     write(io, Cchar('0'), 1.1, 2.2)
@@ -985,7 +1011,7 @@ function test_binary_parse_k()
     model.is_binary = true
     NL._resize_variables(model, 3)
     io = IOBuffer()
-    write(io, Char('k'), Int32(2))
+    write(io, Cchar('k'), Int32(2))
     write(io, Int32(2))
     write(io, Int32(4))
     seekstart(io)
@@ -994,6 +1020,52 @@ function test_binary_parse_k()
     return
 end
 
+function test_binary_parse_S()
+    model = NL._CacheModel()
+    model.is_binary = true
+    io = IOBuffer()
+    write(io, Cchar('S'), Int32(0), Int32(8))
+    write(io, Int32(4), Cchar('z'), Cchar('o'), Cchar('r'), Cchar('k'))
+    write(io, Int32(0), Int32(2))
+    write(io, Int32(1), Int32(6))
+    write(io, Int32(2), Int32(7))
+    write(io, Int32(3), Int32(8))
+    write(io, Int32(4), Int32(9))
+    write(io, Int32(5), Int32(3))
+    write(io, Int32(6), Int32(5))
+    write(io, Int32(8), Int32(4))
+    seekstart(io)
+    @test_logs(
+        (:warn, "Skipping suffix: `S0 8 zork`"),
+        NL._parse_section(io, model),
+    )
+    @test eof(io)
+    return
+end
+
+function test_binary_parse_S_Float64()
+    model = NL._CacheModel()
+    model.is_binary = true
+    io = IOBuffer()
+    write(io, Cchar('S'), Int32(4), Int32(8))
+    write(io, Int32(4), Cchar('z'), Cchar('o'), Cchar('r'), Cchar('k'))
+    write(io, Int32(0), 2.1)
+    write(io, Int32(1), 6.1)
+    write(io, Int32(2), 7.1)
+    write(io, Int32(3), 8.1)
+    write(io, Int32(4), 9.1)
+    write(io, Int32(5), 3.1)
+    write(io, Int32(6), 5.1)
+    write(io, Int32(8), 4.1)
+    seekstart(io)
+    @test_logs(
+        (:warn, "Skipping suffix: `S4 8 zork`"),
+        NL._parse_section(io, model),
+    )
+    @test eof(io)
+    return
+end
+
 end
 
 TestNonlinearRead.runtests()