From 7103accabb1b2aa0690bd1a0667f182f501a075a Mon Sep 17 00:00:00 2001 From: Geoffrey De Smet Date: Fri, 4 Nov 2016 20:13:20 +0100 Subject: [PATCH] NQueensSolutionCloner + remove CloneLedger --- .../domain/solution/cloner/CloneLedger.java | 23 --------- .../optional/NQueensSolutionCloner.java | 49 +++++++++++++++++++ 2 files changed, 49 insertions(+), 23 deletions(-) delete mode 100644 optaplanner-core/src/main/java/org/optaplanner/core/api/domain/solution/cloner/CloneLedger.java create mode 100644 optaplanner-examples/src/main/java/org/optaplanner/examples/nqueens/optional/NQueensSolutionCloner.java diff --git a/optaplanner-core/src/main/java/org/optaplanner/core/api/domain/solution/cloner/CloneLedger.java b/optaplanner-core/src/main/java/org/optaplanner/core/api/domain/solution/cloner/CloneLedger.java deleted file mode 100644 index bcbfd84e73..0000000000 --- a/optaplanner-core/src/main/java/org/optaplanner/core/api/domain/solution/cloner/CloneLedger.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2016 Red Hat, Inc. and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.optaplanner.core.api.domain.solution.cloner; - -public interface CloneLedger { - - void registerClone(E original, E clone); - -} diff --git a/optaplanner-examples/src/main/java/org/optaplanner/examples/nqueens/optional/NQueensSolutionCloner.java b/optaplanner-examples/src/main/java/org/optaplanner/examples/nqueens/optional/NQueensSolutionCloner.java new file mode 100644 index 0000000000..03e8bf49d4 --- /dev/null +++ b/optaplanner-examples/src/main/java/org/optaplanner/examples/nqueens/optional/NQueensSolutionCloner.java @@ -0,0 +1,49 @@ +/* + * Copyright 2016 Red Hat, Inc. and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.optaplanner.examples.nqueens.optional; + +import java.util.ArrayList; +import java.util.List; + +import org.optaplanner.core.api.domain.solution.cloner.SolutionCloner; +import org.optaplanner.examples.nqueens.domain.NQueens; +import org.optaplanner.examples.nqueens.domain.Queen; + +public class NQueensSolutionCloner implements SolutionCloner { + + @Override + public NQueens cloneSolution(NQueens original) { + NQueens clone = new NQueens(); + clone.setId(original.getId()); + clone.setN(original.getN()); + clone.setColumnList(original.getColumnList()); + clone.setRowList(original.getRowList()); + List queenList = original.getQueenList(); + List clonedQueenList = new ArrayList(queenList.size()); + for (Queen originalQueen : queenList) { + Queen cloneQueen = new Queen(); + cloneQueen.setId(originalQueen.getId()); + cloneQueen.setColumn(originalQueen.getColumn()); + cloneQueen.setRow(originalQueen.getRow()); + clonedQueenList.add(cloneQueen); + } + clone.setQueenList(clonedQueenList); + clone.setScore(original.getScore()); + return clone; + } + +}