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

mv tsp.cs & vrp.cs to cp/samples

Browse Source
This commit is contained in:
Corentin Le Molgat
2018-12-27 10:56:05 +01:00
parent 5a4ab80646
commit 9ad342903c
6 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
makefiles/Makefile.dotnet.mk
View File

@@ -482,6 +482,13 @@ rdotnet_%.cs: \
"$(DOTNET_BIN)" build ortools$Salgorithms$Ssamples$S$*.csproj
"$(DOTNET_BIN)" run --no-build --project ortools$Salgorithms$Ssamples$S$*.csproj -- $(ARGS)
rdotnet_%.cs: \
ortools/constraint_solver/samples/%.cs \
ortools/constraint_solver/samples/%.csproj \
$(DOTNET_ORTOOLS_NUPKG) FORCE
"$(DOTNET_BIN)" build ortools$Sconstraint_solver$Ssamples$S$*.csproj
"$(DOTNET_BIN)" run --no-build --project ortools$Sconstraint_solver$Ssamples$S$*.csproj -- $(ARGS)
rdotnet_%.cs: \
ortools/graph/samples/%.cs \
ortools/graph/samples/%.csproj \
@@ -506,6 +513,11 @@ rdotnet_%.cs: \
.PHONY: test_dotnet_algorithms_samples # Build and Run all .Net LP Samples (located in ortools/algorithms/samples)
test_dotnet_algorithms_samples: ;
.PHONY: test_dotnet_constraint_solver_samples # Build and Run all .Net CP Samples (located in ortools/constraint_solver/samples)
test_dotnet_constraint_solver_samples:
$(MAKE) run SOURCE=ortools/constraint_solver/samples/Tsp.cs
$(MAKE) run SOURCE=ortools/constraint_solver/samples/Vrp.cs
.PHONY: test_dotnet_graph_samples # Build and Run all .Net LP Samples (located in ortools/graph/samples)
test_dotnet_graph_samples: ;
$(MAKE) run SOURCE=ortools/graph/samples/SimpleMaxFlowProgram.cs
@@ -538,6 +550,7 @@ test_dotnet_sat_samples:
.PHONY: check_dotnet_pimpl
check_dotnet_pimpl: \
test_dotnet_algorithms_samples \
test_dotnet_constraint_solver_samples \
test_dotnet_graph_samples \
test_dotnet_linear_solver_samples \
test_dotnet_sat_samples \
@@ -571,8 +584,6 @@ test_dotnet_examples_csharp: \
rdotnet_csls_api.cs \
rdotnet_csrabbitspheasants.cs \
rdotnet_cstsp.cs \
rdotnet_tsp.cs \
rdotnet_vrp.cs \
\
rdotnet_3_jugs_regular.cs \
rdotnet_a_puzzle.cs \

0
examples/dotnet/tsp.cs → ortools/constraint_solver/samples/Tsp.cs
View File

4
examples/dotnet/tsp.csproj → ortools/constraint_solver/samples/Tsp.csproj
View File

@@ -4,7 +4,7 @@
<LangVersion>7.2</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
<RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="tsp.cs" />
<Compile Include="Tsp.cs" />
<PackageReference Include="Google.OrTools" Version="7.0-*" />
</ItemGroup>
</Project>

0
examples/dotnet/vrp.cs → ortools/constraint_solver/samples/Vrp.cs
View File

4
examples/dotnet/vrp.csproj → ortools/constraint_solver/samples/Vrp.csproj
View File

@@ -4,7 +4,7 @@
<LangVersion>7.2</LangVersion>
<TargetFramework>netcoreapp2.1</TargetFramework>
<EnableDefaultItems>false</EnableDefaultItems>
<RestoreSources>../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
<RestoreSources>../../../packages;$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="vrp.cs" />
<Compile Include="Vrp.cs" />
<PackageReference Include="Google.OrTools" Version="7.0-*" />
</ItemGroup>
</Project>

9
tools/Makefile.cc.java.dotnet
View File

@@ -493,6 +493,9 @@ dotnet:
# Linear Solver
$(MAKE) run SOURCE=examples/dotnet/SimpleLpProgram.cs
$(MAKE) run SOURCE=examples/dotnet/SimpleMipProgram.cs
# Constraint Solver
$(MAKE) run SOURCE=examples/dotnet/Tsp.cs
$(MAKE) run SOURCE=examples/dotnet/Vrp.cs
# Sat
$(MAKE) run SOURCE=examples/dotnet/NursesSat.cs
$(MAKE) run SOURCE=examples/dotnet/JobshopSat.cs
@@ -502,8 +505,6 @@ dotnet:
# Misc
$(MAKE) run SOURCE=examples/dotnet/cslinearprogramming.cs
$(MAKE) run SOURCE=examples/dotnet/csintegerprogramming.cs
$(MAKE) run SOURCE=examples/dotnet/tsp.cs
$(MAKE) run SOURCE=examples/dotnet/vrp.cs
$(MAKE) run SOURCE=examples/dotnet/assignment.cs
$(MAKE) run SOURCE=examples/dotnet/alldifferent_except_0.cs
$(MAKE) run SOURCE=examples/dotnet/all_interval.cs
@@ -632,8 +633,8 @@ dotnet:
test_dotnet: detect_dotnet
$(MAKE) run SOURCE=examples/dotnet/SimpleLpProgram.cs
$(MAKE) run SOURCE=examples/dotnet/SimpleMipProgram.cs
$(MAKE) run SOURCE=examples/dotnet/tsp.cs
$(MAKE) run SOURCE=examples/dotnet/vrp.cs
$(MAKE) run SOURCE=examples/dotnet/Tsp.cs
$(MAKE) run SOURCE=examples/dotnet/Vrp.cs
$(MAKE) run SOURCE=examples/dotnet/JobshopSat.cs
$(MAKE) run SOURCE=examples/dotnet/NursesSat.cs