Skip to content

Commit

Permalink
Fix #3200
Browse files Browse the repository at this point in the history
  • Loading branch information
Mizux committed Apr 4, 2022
1 parent 843cee0 commit be55b29
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 363 deletions.
12 changes: 8 additions & 4 deletions Makefile
Expand Up @@ -107,7 +107,7 @@ else
endif

.PHONY: help_all
help_all: help_usage help_cc help_dotnet help_java help_python help_doc #help_archive
help_all: help_usage help_cc help_dotnet help_java help_python help_archive help_doc

# Commands to build/clean all languages.
.PHONY: compile
Expand All @@ -129,15 +129,19 @@ test_all: test_cpp test_dotnet test_java test_python
@echo Or-tools have been built and tested for "$(BUILT_LANGUAGES)"

.PHONY: archive_all
archive_all: archive_cpp archive_dotnet archive_java archive_python
archive_all: archive_cpp archive_dotnet archive_java archive_python archive_data
@echo Or-tools has been built and archived for "$(BUILT_LANGUAGES)"

.PHONY: test_archive_all
archive_all: test_archive_cpp test_archive_dotnet test_archive_java test_archive_python
@echo Or-tools has been built and archived for "$(BUILT_LANGUAGES)"

.PHONY: clean_all
clean_all: clean_cpp clean_dotnet clean_java clean_python #clean_archive
clean_all: clean_cpp clean_dotnet clean_java clean_python clean_archive
@echo Or-Tools has been cleaned for "$(BUILT_LANGUAGES)"

.PHONY: detect_all
detect_all: detect_port detect_cpp detect_dotnet detect_java detect_python #detect_archive
detect_all: detect_port detect_cpp detect_dotnet detect_java detect_python detect_archive
@echo SOURCE = $(SOURCE)
@echo SOURCE_PATH = $(SOURCE_PATH)
@echo SOURCE_NAME = $(SOURCE_NAME)
Expand Down
23 changes: 1 addition & 22 deletions examples/dotnet/README.md
@@ -1,6 +1,6 @@
# .NetCoreApp examples
The following examples showcase how to use OrTools.<br>
The project solution has examples for both C# and F#.
The project solution has examples for C#.

We recommend that all projects you create target `net6.0`,
as this allows you to compile for various frameworks and
Expand All @@ -16,24 +16,3 @@ You can run the following command:
dotnet build <example>.csproj
dotnet run --no-build --project <example>.csproj
```

## Note on Google.OrTools.FSharp
This part describes how to use Google.OrTools.FSharp nuget package in F#.

### SolverOptions and lpSolve
This function and parameter object are a wrapper around the standard Google.OrTools functions.<br>
It is designed to enter the Linear/Integer program as *matrices* and *vectors*.

Two input formats are allowed:
* Canonical Form;
* Standard Form.

**ALL Matrices & Vectors are entered as columns**

### Execution
Running the examples will involve building them, then running them.<br>
You can run the following command:
```shell
dotnet build <example>.fsproj
dotnet run --no-build --project <example>.fsproj
```
2 changes: 1 addition & 1 deletion examples/python/README.md
@@ -1,6 +1,6 @@
# Python examples
The following examples showcase how to use OrTools.
These examples should work for any Python3.6+.
These examples should work for any Python3.7+.

We recommend that all projects you create target `Python 3.9`,
as this allows you to keep up-to-date with the latest Python frameworks.
Expand Down

0 comments on commit be55b29

Please sign in to comment.