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

Update macro in constraint_solver.i

Browse Source
This commit is contained in:
Corentin Le Molgat
2019-03-21 17:13:49 +01:00
parent b1ce1d3f77
commit 05a76b1f5f
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
ortools/constraint_solver/python/constraint_solver.i
View File

@@ -1908,21 +1908,23 @@ namespace operations_research {
%unignore Rev<bool>::SetValue;
%template(RevBool) Rev<bool>;
%define CONTAINERHELPER(type, typeElement, name)
%rename (name) AssignmentContainer<type, typeElement>;
%unignore AssignmentContainer<type, typeElement>::Contains;
%rename (Element) AssignmentContainer<type, typeElement>::MutableElement(int);
%unignore AssignmentContainer<type, typeElement>::Size;
%unignore AssignmentContainer<type, typeElement>::Store;
%unignore AssignmentContainer<type, typeElement>::Restore;
%template (name) AssignmentContainer<type, typeElement>;
#define PARENTHIZE(X...) X
%define RENAME_ASSIGNMENT_CONTAINER(TYPE, NEW_NAME)
%rename (NEW_NAME) TYPE;
%unignore TYPE::Contains;
%rename (Element) TYPE::MutableElement(int);
%unignore TYPE::Size;
%unignore TYPE::Store;
%unignore TYPE::Restore;
%template (NEW_NAME) TYPE;
%enddef
CONTAINERHELPER(IntVar, IntVarElement, IntContainer)
CONTAINERHELPER(IntervalVar, IntervalVarElement, IntervalContainer)
CONTAINERHELPER(SequenceVar, SequenceVarElement, SequenceContainer)
RENAME_ASSIGNMENT_CONTAINER(PARENTHIZE(AssignmentContainer<IntVar, IntVarElement>), IntVarContainer)
RENAME_ASSIGNMENT_CONTAINER(PARENTHIZE(AssignmentContainer<IntervalVar, IntervalVarElement>), IntervalVarContainer)
RENAME_ASSIGNMENT_CONTAINER(PARENTHIZE(AssignmentContainer<SequenceVar, SequenceVarElement>), SequenceVarContainer)
#undef CONTAINERHELPER
#undef RENAME_ASSIGNMENT_CONTAINER
#undef PARENTHIZE
} // namespace operations_research