diff options
Diffstat (limited to '')
| -rw-r--r-- | cpp/nissy.cpp | 13 | ||||
| -rw-r--r-- | cpp/nissy.h | 8 |
2 files changed, 11 insertions, 10 deletions
diff --git a/cpp/nissy.cpp b/cpp/nissy.cpp index a077c50..3c41733 100644 --- a/cpp/nissy.cpp +++ b/cpp/nissy.cpp | |||
| @@ -13,7 +13,7 @@ extern "C" { | |||
| 13 | long long nissy_applymoves(const char *, const char *, char *); | 13 | long long nissy_applymoves(const char *, const char *, char *); |
| 14 | long long nissy_applytrans(const char *, const char *, char *); | 14 | long long nissy_applytrans(const char *, const char *, char *); |
| 15 | long long nissy_getcube(long long, long long, long long, long long, | 15 | long long nissy_getcube(long long, long long, long long, long long, |
| 16 | const char *, char *); | 16 | long long, const char *, char *); |
| 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 *); |
| @@ -103,19 +103,20 @@ namespace nissy { | |||
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | std::variant<cube, error> | 105 | std::variant<cube, error> |
| 106 | cube::get(long long ep, long long eo, long long cp, long long co) | 106 | cube::get(long long ep, long long eo, |
| 107 | long long cp, long long co, long long orien) | ||
| 107 | { | 108 | { |
| 108 | return get(ep, eo, cp, co, "fix"); | 109 | return get(ep, eo, cp, co, orien, "fix"); |
| 109 | } | 110 | } |
| 110 | 111 | ||
| 111 | std::variant<cube, error> | 112 | std::variant<cube, error> |
| 112 | cube::get(long long ep, long long eo, long long cp, long long co, | 113 | cube::get(long long ep, long long eo, long long cp, long long co, |
| 113 | const std::string& options) | 114 | long long orient, const std::string& options) |
| 114 | { | 115 | { |
| 115 | char result[size::CUBE]; | 116 | char result[size::CUBE]; |
| 116 | cube c; | 117 | cube c; |
| 117 | auto err = nissy_getcube( | 118 | auto err = nissy_getcube(ep, eo, cp, co, orient, |
| 118 | ep, eo, cp, co, options.c_str(), result); | 119 | options.c_str(), result); |
| 119 | if (err < 0) | 120 | if (err < 0) |
| 120 | return error{err}; | 121 | return error{err}; |
| 121 | c.m_str = result; | 122 | c.m_str = result; |
diff --git a/cpp/nissy.h b/cpp/nissy.h index 8fd0aff..4fa98ad 100644 --- a/cpp/nissy.h +++ b/cpp/nissy.h | |||
| @@ -56,10 +56,10 @@ namespace nissy { | |||
| 56 | 56 | ||
| 57 | static std::variant<cube, error> from_string( | 57 | static std::variant<cube, error> from_string( |
| 58 | const std::string&); | 58 | const std::string&); |
| 59 | static std::variant<cube, error> get( | 59 | static std::variant<cube, error> get(long long ep, |
| 60 | long long ep, long long eo, long long cp, long long co); | 60 | long long eo, long long cp, long long co, long long orien); |
| 61 | static std::variant<cube, error> get( | 61 | static std::variant<cube, error> get(long long ep, |
| 62 | long long ep, long long eo, long long cp, long long co, | 62 | long long eo, long long cp, long long co, long long orien, |
| 63 | const std::string& options); | 63 | const std::string& options); |
| 64 | 64 | ||
| 65 | private: | 65 | private: |