Skip to content

Ignore more comments in SIF files #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Ignore more comments in SIF files #55

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fec27f
Ignore more comments in SIF files
amontoison Apr 20, 2025
c155100
Better handle some cards
amontoison Apr 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/readqps.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ Read the fields in `ln` into `card`.
"""
function read_card!(card::MPSCard{FixedMPS}, ln::String)
l = length(ln)
if l == 0 || ln[1] == '*' || ln[1] == '&'
if l == 0 || ln[1] == '*' || ln[1] == '&' || ln[1] == '$'
# This line is an empty line, or it is a comment
card.iscomment = true
card.isheader = false
Expand Down Expand Up @@ -314,7 +314,7 @@ Read the fields in `ln` into `card`.
"""
function read_card!(card::MPSCard{FreeMPS}, ln::String)
l = length(ln)
if l == 0 || ln[1] == '*' || ln[1] == '&'
if l == 0 || ln[1] == '*' || ln[1] == '&' || ln[1] == '$'
# This line is an empty line, or it is a comment
card.iscomment = true
card.isheader = false
Expand Down Expand Up @@ -850,12 +850,12 @@ function readqps(qps::IO; mpsformat::Symbol = :free)
elseif sec == COLUMNS
# Check if card is marker
if card.f2 == "'MARKER'"
if card.f3 == "'INTORG'"
if card.f3 == "'INTORG'" || card.f4 == "'INTORG'"
integer_section = true
elseif card.f3 == "'INTEND'"
elseif card.f3 == "'INTEND'" || card.f4 == "'INTEND'"
integer_section = false
else
@error "Ignoring marker $(card.f3) at line $(card.nline)"
@error "Ignoring marker $(card.f3) (or $(card.f4)) at line $(card.nline)"
end
continue
end
Expand Down
Loading