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

java: Add all AssignmentContainer template intantiation

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-12-18 14:39:52 +01:00
parent f4f7dd06e2
commit 77579d5faa
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/java/LsApi.java
View File

@@ -12,7 +12,7 @@
// limitations under the License. // limitations under the License.
import com.google.ortools.constraintsolver.Assignment; import com.google.ortools.constraintsolver.Assignment;
import com.google.ortools.constraintsolver.AssignmentIntContainer; import com.google.ortools.constraintsolver.IntContainer;
import com.google.ortools.constraintsolver.BaseLns; import com.google.ortools.constraintsolver.BaseLns;
import com.google.ortools.constraintsolver.DecisionBuilder; import com.google.ortools.constraintsolver.DecisionBuilder;
import com.google.ortools.constraintsolver.IntVar; import com.google.ortools.constraintsolver.IntVar;
@@ -100,7 +100,7 @@ public class LsApi {
@Override @Override
public boolean accept(Assignment delta, Assignment unusedDeltadelta) { public boolean accept(Assignment delta, Assignment unusedDeltadelta) {
AssignmentIntContainer solutionDelta = delta.intVarContainer(); IntContainer solutionDelta = delta.intVarContainer();
int solutionDeltaSize = solutionDelta.size(); int solutionDeltaSize = solutionDelta.size();
for (int i = 0; i < solutionDeltaSize; ++i) { for (int i = 0; i < solutionDeltaSize; ++i) {

4
ortools/constraint_solver/java/constraint_solver.i
View File

@@ -749,5 +749,7 @@ namespace operations_research {
%template(RevInteger) Rev<int>; %template(RevInteger) Rev<int>;
%template(RevLong) Rev<int64>; %template(RevLong) Rev<int64>;
%template(RevBool) Rev<bool>; %template(RevBool) Rev<bool>;
%template(AssignmentIntContainer) AssignmentContainer<IntVar, IntVarElement>; %template(IntContainer) AssignmentContainer<IntVar, IntVarElement>;
%template(IntervalContainer) AssignmentContainer<IntervalVar, IntervalVarElement>;
%template(SequenceContainer) AssignmentContainer<SequenceVar,SequenceVarElement>;
} // namespace operations_research } // namespace operations_research