Skip to content
This repository has been archived by the owner on Nov 13, 2017. It is now read-only.

Commit

Permalink
Migrate to optaplanner from drools-planner
Browse files Browse the repository at this point in the history
  • Loading branch information
ge0ffrey committed Mar 10, 2013
1 parent b3914c6 commit f5ccc13
Show file tree
Hide file tree
Showing 12 changed files with 37 additions and 37 deletions.
18 changes: 9 additions & 9 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@

<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.drools.planner</groupId>
<artifactId>drools-planner</artifactId>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner</artifactId>
<version>6.0.0-SNAPSHOT</version>
</parent>

<groupId>org.drools.planner.examples</groupId>
<groupId>org.optaplanner.examples</groupId>
<artifactId>mista2013</artifactId>
<packaging>jar</packaging>

Expand All @@ -23,18 +23,18 @@

<dependencies>
<dependency>
<groupId>org.drools.planner</groupId>
<artifactId>drools-planner-core</artifactId>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-core</artifactId>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.drools.planner</groupId>
<artifactId>drools-planner-benchmark</artifactId>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-benchmark</artifactId>
<version>6.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.drools.planner</groupId>
<artifactId>drools-planner-examples</artifactId>
<groupId>org.optaplanner</groupId>
<artifactId>optaplanner-examples</artifactId>
<version>6.0.0-SNAPSHOT</version>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.optaplanner.examples.mista2013.app;

import org.drools.planner.config.XmlSolverFactory;
import org.drools.planner.core.Solver;
import org.drools.planner.examples.common.app.CommonApp;
import org.drools.planner.examples.common.persistence.AbstractSolutionExporter;
import org.drools.planner.examples.common.persistence.AbstractSolutionImporter;
import org.drools.planner.examples.common.persistence.SolutionDao;
import org.drools.planner.examples.common.swingui.SolutionPanel;
import org.optaplanner.config.XmlSolverFactory;
import org.optaplanner.core.Solver;
import org.optaplanner.examples.common.app.CommonApp;
import org.optaplanner.examples.common.persistence.AbstractSolutionExporter;
import org.optaplanner.examples.common.persistence.AbstractSolutionImporter;
import org.optaplanner.examples.common.persistence.SolutionDao;
import org.optaplanner.examples.common.swingui.SolutionPanel;
import org.optaplanner.examples.mista2013.persistence.Mista2013DaoImpl;
import org.optaplanner.examples.mista2013.persistence.Mista2013SolutionExporter;
import org.optaplanner.examples.mista2013.persistence.Mista2013SolutionImporter;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.optaplanner.examples.mista2013.app;

import org.drools.planner.examples.common.app.CommonBenchmarkApp;
import org.optaplanner.examples.common.app.CommonBenchmarkApp;

public class Mista2013BenchmarkApp extends CommonBenchmarkApp {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

import java.util.Collection;

import org.drools.planner.api.domain.entity.PlanningEntity;
import org.drools.planner.api.domain.value.ValueRange;
import org.drools.planner.api.domain.value.ValueRangeType;
import org.drools.planner.api.domain.variable.PlanningVariable;
import org.optaplanner.api.domain.entity.PlanningEntity;
import org.optaplanner.api.domain.value.ValueRange;
import org.optaplanner.api.domain.value.ValueRangeType;
import org.optaplanner.api.domain.variable.PlanningVariable;
import org.optaplanner.examples.mista2013.domain.solver.AllocationComparator;
import org.optaplanner.examples.mista2013.domain.solver.JobModeComparator;
import org.optaplanner.examples.mista2013.domain.solver.StartDateComparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import java.util.List;
import java.util.Map;

import org.drools.planner.api.domain.solution.PlanningEntityCollectionProperty;
import org.drools.planner.api.domain.solution.PlanningSolution;
import org.drools.planner.core.score.buildin.bendable.BendableScore;
import org.drools.planner.core.solution.Solution;
import org.optaplanner.api.domain.solution.PlanningEntityCollectionProperty;
import org.optaplanner.api.domain.solution.PlanningSolution;
import org.optaplanner.core.score.buildin.bendable.BendableScore;
import org.optaplanner.core.solution.Solution;
import org.optaplanner.examples.mista2013.solver.solution.Mista2013SolutionCloner;

@PlanningSolution(solutionCloner = Mista2013SolutionCloner.class)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.optaplanner.examples.mista2013.persistence;

import org.drools.planner.examples.common.persistence.XStreamSolutionDaoImpl;
import org.optaplanner.examples.common.persistence.XStreamSolutionDaoImpl;
import org.optaplanner.examples.mista2013.domain.Mista2013;

public class Mista2013DaoImpl extends XStreamSolutionDaoImpl {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.io.File;

import org.drools.planner.core.solution.ProblemIO;
import org.drools.planner.core.solution.Solution;
import org.optaplanner.core.solution.ProblemIO;
import org.optaplanner.core.solution.Solution;

public class Mista2013ProblemIO implements ProblemIO {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import java.io.IOException;

import org.drools.planner.core.solution.Solution;
import org.drools.planner.examples.common.persistence.AbstractTxtSolutionExporter;
import org.optaplanner.core.solution.Solution;
import org.optaplanner.examples.common.persistence.AbstractTxtSolutionExporter;
import org.optaplanner.examples.mista2013.domain.Allocation;
import org.optaplanner.examples.mista2013.domain.Job;
import org.optaplanner.examples.mista2013.domain.JobMode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.List;
import java.util.Map;

import org.drools.planner.examples.common.persistence.AbstractTxtSolutionImporter;
import org.optaplanner.examples.common.persistence.AbstractTxtSolutionImporter;
import org.optaplanner.examples.mista2013.domain.Job;
import org.optaplanner.examples.mista2013.domain.Job.JobType;
import org.optaplanner.examples.mista2013.domain.JobMode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.optaplanner.examples.mista2013.solver.score;

import org.drools.planner.core.score.buildin.bendable.BendableScore;
import org.drools.planner.core.score.director.incremental.AbstractIncrementalScoreCalculator;
import org.optaplanner.core.score.buildin.bendable.BendableScore;
import org.optaplanner.core.score.director.incremental.AbstractIncrementalScoreCalculator;
import org.optaplanner.examples.mista2013.domain.Allocation;
import org.optaplanner.examples.mista2013.domain.Mista2013;
import org.optaplanner.examples.mista2013.domain.ProblemInstance;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.optaplanner.examples.mista2013.solver.solution;

import org.drools.planner.api.domain.solution.cloner.SolutionCloner;
import org.optaplanner.api.domain.solution.cloner.SolutionCloner;
import org.optaplanner.examples.mista2013.domain.Allocation;
import org.optaplanner.examples.mista2013.domain.Job;
import org.optaplanner.examples.mista2013.domain.Mista2013;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

import javax.swing.BoxLayout;

import org.drools.planner.core.solution.Solution;
import org.drools.planner.examples.common.swingui.SolutionPanel;
import org.drools.planner.examples.common.swingui.TangoColorFactory;
import org.optaplanner.core.solution.Solution;
import org.optaplanner.examples.common.swingui.SolutionPanel;
import org.optaplanner.examples.common.swingui.TangoColorFactory;
import org.optaplanner.examples.mista2013.domain.Allocation;
import org.optaplanner.examples.mista2013.domain.Job;
import org.optaplanner.examples.mista2013.domain.Mista2013;
Expand Down

0 comments on commit f5ccc13

Please sign in to comment.