always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more work on flatzinc support

Browse Source
This commit is contained in:
lperron@google.com
2012-06-02 17:31:48 +00:00
parent 4a129f8232
commit 5a506bb854
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/flatzinc/flatzinc.cc
View File

@@ -295,20 +295,7 @@ string FlatZincModel::DebugString() const {
return "";
string output;
for (unsigned int i = 0; i < output_->a.size(); i++) {
AST::Node* ai = output_->a[i];
if (ai->isArray()) {
AST::Array* aia = ai->getArray();
int size = aia->a.size();
output += "[";
for (int j=0; j<size; j++) {
output += DebugString(aia->a[j]);
if (j<size-1)
output += ", ";
}
output += "]";
} else {
output += DebugString(ai);
}
output += DebugString(output_->a[i]);
}
return output;
}
@@ -320,7 +307,18 @@ void FlatZincModel::InitOutput(AST::Array* output) {
string FlatZincModel::DebugString(AST::Node* ai) const {
string output;
int k;
if (ai->isInt(k)) {
if (ai->isArray()) {
AST::Array* aia = ai->getArray();
int size = aia->a.size();
output += "[";
for (int j = 0; j < size; j++) {
output += DebugString(aia->a[j]);
if (j < size - 1) {
output += ", ";
}
}
output += "]";
} else if (ai->isInt(k)) {
output += StringPrintf("%d", k);
} else if (ai->isIntVar()) {
IntVar* const var = integer_variables_[ai->getIntVar()];