diff options
| author | Sebastiano Tronto <sebastiano@tronto.net> | 2025-05-19 17:45:14 +0200 |
|---|---|---|
| committer | Sebastiano Tronto <sebastiano@tronto.net> | 2025-05-19 17:45:14 +0200 |
| commit | 62d87e063318cc4c842b1b2d8c184f48aeaf6659 (patch) | |
| tree | 832bf338232c477975bea69f7370ca13f350fb07 /cpp | |
| parent | 8b94d135429a9f3253cc7f25a1453b412065c4a0 (diff) | |
| download | nissy-core-62d87e063318cc4c842b1b2d8c184f48aeaf6659.tar.gz nissy-core-62d87e063318cc4c842b1b2d8c184f48aeaf6659.zip | |
Refactored checkdata
Relevant changes include:
- Changed the signature of nissy_checkdata().
- Removed expected_distribution.h from tools; this data is now included
in each solver's src/ code.
- Removed distribution check for cocsep; may add back later.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/nissy.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/nissy.cpp b/cpp/nissy.cpp index 25039bb..ed0dc0f 100644 --- a/cpp/nissy.cpp +++ b/cpp/nissy.cpp | |||
| @@ -17,7 +17,8 @@ extern "C" { | |||
| 17 | long long nissy_solverinfo(const char *, char *); | 17 | long long nissy_solverinfo(const char *, char *); |
| 18 | long long nissy_gendata(const char *, unsigned long long, | 18 | long long nissy_gendata(const char *, unsigned long long, |
| 19 | unsigned char *); | 19 | unsigned char *); |
| 20 | long long nissy_checkdata(unsigned long long, const unsigned char *); | 20 | long long nissy_checkdata(const char *, unsigned long long, |
| 21 | const unsigned char *); | ||
| 21 | long long nissy_solve(const char *, const char *, unsigned, unsigned, | 22 | long long nissy_solve(const char *, const char *, unsigned, unsigned, |
| 22 | unsigned, unsigned, unsigned, unsigned, unsigned long long, | 23 | unsigned, unsigned, unsigned, unsigned, unsigned long long, |
| 23 | const unsigned char *, unsigned, char *, long long *, | 24 | const unsigned char *, unsigned, char *, long long *, |
| @@ -144,7 +145,7 @@ namespace nissy { | |||
| 144 | 145 | ||
| 145 | error solver::check_data() | 146 | error solver::check_data() |
| 146 | { | 147 | { |
| 147 | auto err_value = nissy_checkdata(data.size(), | 148 | auto err_value = nissy_checkdata(name.c_str(), data.size(), |
| 148 | reinterpret_cast<const unsigned char *>(data.data())); | 149 | reinterpret_cast<const unsigned char *>(data.data())); |
| 149 | error err{err_value}; | 150 | error err{err_value}; |
| 150 | data_checked = err.ok(); | 151 | data_checked = err.ok(); |
