Skip to content

Commit 29649c3

Browse files
committed
Update
1 parent 6dff51f commit 29649c3

2 files changed

Lines changed: 1 addition & 26 deletions

File tree

src/FileFormats/NL/read.jl

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -403,12 +403,7 @@ function _parse_header(io::IO, model::_CacheModel)
403403
# them
404404
_read_til_newline(io, model)
405405
# Line 10
406-
# We don't support reading common subexpressions
407-
for _ in 1:5
408-
if _next(Int, io, model) > 0
409-
error("Unable to parse NL file : we don't support common exprs")
410-
end
411-
end
406+
# We support subexpressions, but we don't need to know the details yet.
412407
_read_til_newline(io, model)
413408
# ==========================================================================
414409
# Deal with the integrality of variables. This is quite complicated, so go

test/FileFormats/NL/test_read.jl

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -166,26 +166,6 @@ function test_parse_header_assertion_errors()
166166
return
167167
end
168168

169-
function test_parse_header_common_expressions()
170-
model = NL._CacheModel()
171-
err = ErrorException(
172-
"Unable to parse NL file : we don't support common exprs",
173-
)
174-
for header in [
175-
"g3 1 1 0\n4 2 1 0 1 0\n2 1\n0 0\n4 0 0\n0 0 0 1\n0 0 0 2 0\n8 4\n0 0\n1 0 0 0 0\n",
176-
"g3 1 1 0\n4 2 1 0 1 0\n2 1\n0 0\n4 0 0\n0 0 0 1\n0 0 0 2 0\n8 4\n0 0\n0 1 0 0 0\n",
177-
"g3 1 1 0\n4 2 1 0 1 0\n2 1\n0 0\n4 0 0\n0 0 0 1\n0 0 0 2 0\n8 4\n0 0\n0 0 1 0 0\n",
178-
"g3 1 1 0\n4 2 1 0 1 0\n2 1\n0 0\n4 0 0\n0 0 0 1\n0 0 0 2 0\n8 4\n0 0\n0 0 0 1 0\n",
179-
"g3 1 1 0\n4 2 1 0 1 0\n2 1\n0 0\n4 0 0\n0 0 0 1\n0 0 0 2 0\n8 4\n0 0\n0 0 0 0 1\n",
180-
]
181-
io = IOBuffer()
182-
write(io, header)
183-
seekstart(io)
184-
@test_throws(err, NL._parse_header(io, model))
185-
end
186-
return
187-
end
188-
189169
function test_parse_y_error()
190170
model = NL._CacheModel()
191171
NL._resize_variables(model, 4)

0 commit comments

Comments
 (0)