From 25ea2b89a043323463c3c7a54cf5e4daa2fd226b Mon Sep 17 00:00:00 2001
From: Jochem Snuverink <jochem.snuverink@psi.ch>
Date: Tue, 7 Nov 2017 10:03:42 +0100
Subject: [PATCH] add CONSTRAINT to optimiser keywords, fixes #179
---
src/Classic/Parser/AbsFileStream.cpp | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/Classic/Parser/AbsFileStream.cpp b/src/Classic/Parser/AbsFileStream.cpp
index 67905eaa2..21338c77c 100644
--- a/src/Classic/Parser/AbsFileStream.cpp
+++ b/src/Classic/Parser/AbsFileStream.cpp
@@ -45,12 +45,10 @@ bool AbsFileStream::optimCmdPresent(std::string str) {
std::string s = str;
std::transform(s.begin(), s.end(),s.begin(), ::toupper);
- return (s.find("DVAR")!=std::string::npos) ||
- (s.find("DVARS")!=std::string::npos) ||
- (s.find("OBJECTIVE")!=std::string::npos) ||
- (s.find("OBJECTIVES")!=std::string::npos) ||
- (s.find("CONSTRAINTS")!=std::string::npos) ||
- (s.find("OPTIMIZE")!=std::string::npos);
+ return (s.find("DVAR") !=std::string::npos) || // will also find DVARS
+ (s.find("OBJECTIVE") !=std::string::npos) || // will also find OBJECTIVES
+ (s.find("CONSTRAINT") !=std::string::npos) || // will also find CONSTRAINTS
+ (s.find("OPTIMIZE") !=std::string::npos);
}
--
GitLab