Skip to content

Commit cd53ee0

Browse files
authored
Dispatch root java samples into their respective folders. (#4977)
* Dispatch root java samples into their respective folders. * Fix CMakeLists.txt
1 parent 2a974e7 commit cd53ee0

File tree

10 files changed

+10
-43
lines changed

10 files changed

+10
-43
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,6 @@ foreach(SAMPLES IN ITEMS
452452
endforeach()
453453

454454
# Same for examples
455-
foreach(EXAMPLES IN ITEMS contrib cpp dotnet java python)
455+
foreach(EXAMPLES IN ITEMS contrib cpp dotnet python)
456456
add_subdirectory(examples/${EXAMPLES})
457457
endforeach()

examples/java/CMakeLists.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

examples/java/README.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

examples/java/RabbitsPheasants.java renamed to ortools/constraint_solver/samples/RabbitsPheasants.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.constraintsolver.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.constraintsolver.ConstraintSolverParameters;
@@ -20,9 +20,7 @@
2020
import com.google.ortools.constraintsolver.Solver;
2121
import java.util.logging.Logger;
2222

23-
/**
24-
* Sample showing how to model using the constraint programming solver.
25-
*/
23+
/** Sample showing how to model using the constraint programming solver. */
2624
public class RabbitsPheasants {
2725
private static Logger logger = Logger.getLogger(RabbitsPheasants.class.getName());
2826

ortools/graph/java/graph.swig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
// API to be exposed here.
2222
//
2323
// USAGE EXAMPLES:
24-
// - java/com/google/ortools/samples/FlowExample.java
25-
// - java/com/google/ortools/samples/LinearAssignmentAPI.java
24+
// - java/com/google/ortools/graph/samples/FlowExample.java
25+
// - java/com/google/ortools/graph/samples/LinearAssignmentAPI.java
2626
// - javatests/com/google/ortools/graph/FlowTest.java
2727
//
2828
// These examples are also used as unit tests.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.graph.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.graph.MaxFlow;

examples/java/LinearAssignmentAPI.java renamed to ortools/graph/samples/LinearAssignmentAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.graph.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.graph.LinearSumAssignment;

examples/java/IntegerProgramming.java renamed to ortools/linear_solver/samples/IntegerProgramming.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.linearsolver.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.linearsolver.MPConstraint;

examples/java/LinearProgramming.java renamed to ortools/linear_solver/samples/LinearProgramming.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.linearsolver.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.linearsolver.MPConstraint;

examples/java/CapacitatedVehicleRoutingProblemWithTimeWindows.java renamed to ortools/routing/samples/CapacitatedVehicleRoutingProblemWithTimeWindows.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// See the License for the specific language governing permissions and
1212
// limitations under the License.
1313

14-
package com.google.ortools.java;
14+
package com.google.ortools.routing.samples;
1515

1616
import com.google.ortools.Loader;
1717
import com.google.ortools.constraintsolver.Assignment;

0 commit comments

Comments
 (0)