Renaming knapsack-highspy to knapsack-highs, adding new marketplace apps

nextmv-io · Jul 9, 2024 · 0c6a6e1 · 0c6a6e1
1 parent 16de20c
commit 0c6a6e1
Show file tree

Hide file tree

Showing 21 changed files with 15 additions and 5 deletions.
diff --git a/...golden/knapsack-highspy/inputs/input.json → ...v/golden/knapsack-highs/inputs/input.json b/...golden/knapsack-highspy/inputs/input.json → ...v/golden/knapsack-highs/inputs/input.json
diff --git a/...knapsack-highspy/inputs/input.json.golden → ...n/knapsack-highs/inputs/input.json.golden b/...knapsack-highspy/inputs/input.json.golden → ...n/knapsack-highs/inputs/input.json.golden
diff --git a/.nextmv/golden/knapsack-highspy/main_test.go → .nextmv/golden/knapsack-highs/main_test.go b/.nextmv/golden/knapsack-highspy/main_test.go → .nextmv/golden/knapsack-highs/main_test.go
@@ -33,7 +33,7 @@ func TestGolden(t *testing.T) {
 			},
 			ExecutionConfig: &golden.ExecutionConfig{
 				Command:    "python3",
-				Args:       []string{"../../../knapsack-highspy/main.py"},
+				Args:       []string{"../../../knapsack-highs/main.py"},
 				InputFlag:  "-input",
 				OutputFlag: "-output",
 			},

diff --git a/.nextmv/golden/workflow-configuration.yml b/.nextmv/golden/workflow-configuration.yml
@@ -13,7 +13,7 @@ apps:
   - name: knapsack-gurobi
     language: python
     language-version: 3.11
-  - name: knapsack-highspy
+  - name: knapsack-highs
     language: python
     language-version: 3.11
   - name: knapsack-java-ortools

diff --git a/.nextmv/readme/knapsack-highspy/0.sh → .nextmv/readme/knapsack-highs/0.sh b/.nextmv/readme/knapsack-highspy/0.sh → .nextmv/readme/knapsack-highs/0.sh
diff --git a/.nextmv/readme/knapsack-highspy/0.sh.golden → .nextmv/readme/knapsack-highs/0.sh.golden b/.nextmv/readme/knapsack-highspy/0.sh.golden → .nextmv/readme/knapsack-highs/0.sh.golden
diff --git a/.nextmv/readme/knapsack-highspy/1.sh → .nextmv/readme/knapsack-highs/1.sh b/.nextmv/readme/knapsack-highspy/1.sh → .nextmv/readme/knapsack-highs/1.sh
diff --git a/.nextmv/readme/knapsack-highspy/1.sh.golden → .nextmv/readme/knapsack-highs/1.sh.golden b/.nextmv/readme/knapsack-highspy/1.sh.golden → .nextmv/readme/knapsack-highs/1.sh.golden
diff --git a/.nextmv/readme/knapsack-highspy/2.sh → .nextmv/readme/knapsack-highs/2.sh b/.nextmv/readme/knapsack-highspy/2.sh → .nextmv/readme/knapsack-highs/2.sh
diff --git a/.nextmv/readme/workflow-configuration.yml b/.nextmv/readme/workflow-configuration.yml
@@ -23,7 +23,7 @@ apps:
         silent: true
       - name: 2.sh
         skip: true
-  - name: knapsack-highspy
+  - name: knapsack-highs
     scripts:
       - name: 0.sh
         silent: true

diff --git a/.nextmv/workflow-configuration.yml b/.nextmv/workflow-configuration.yml
@@ -23,6 +23,11 @@ apps:
     app_id:
     marketplace_app_id:
     description: Solve a knapsack problem using Gurobi in Python.
+  - name: knapsack-highs
+    type: python
+    app_id: knapsack-highs
+    marketplace_app_id: knapsack.highs
+    description: Solve a knapsack problem using HiGHS in Python.
   - name: knapsack-java-ortools
     type: java
     app_id: knapsack-jortools
@@ -63,6 +68,11 @@ apps:
     app_id: routing-ortools
     marketplace_app_id: routing.ortools
     description: Solve a vehicle routing problem using OR-Tools in Python.
+  - name: routing-pyvroom
+    type: python
+    app_id: routing-pyvroom
+    marketplace_app_id: routing.pyvroom
+    description: Solve a vehicle routing problem using PyVroom.
   - name: shift-assignment-ortools
     type: python
     app_id: shift-assign-ortools

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Visit the [docs][docs] for more information.
       problem.
 * [`knapsack-gurobi`][knapsack-gurobi]: use Python and Gurobi to solve a
       knapsack problem.
-* [`knapsack-highspy`][knapsack-highspy]: use Python and HiGHS to solve a
+* [`knapsack-highs`][knapsack-highs]: use Python and HiGHS to solve a
       knapsack problem.
 * [`knapsack-java-ortools`][knapsack-java-ortools]: use Java and OR-Tools to
       solve a knapsack problem.
@@ -63,7 +63,7 @@ Visit the [docs][docs] for more information.
 [knapsack-ampl]: ./knapsack-ampl/README.md
 [knapsack-gosdk]: ./knapsack-gosdk/README.md
 [knapsack-gurobi]: ./knapsack-gurobi/README.md
-[knapsack-highspy]: ./knapsack-highspy/README.md
+[knapsack-highs]: ./knapsack-highs/README.md
 [knapsack-java-ortools]: ./knapsack-java-ortools/README.md
 [knapsack-ortools]: ./knapsack-ortools/README.md
 [knapsack-ortools-csv]: ./knapsack-ortools-csv/README.md

diff --git a/...k-highspy/.devcontainer/devcontainer.json → ...ack-highs/.devcontainer/devcontainer.json b/...k-highspy/.devcontainer/devcontainer.json → ...ack-highs/.devcontainer/devcontainer.json
diff --git a/knapsack-highspy/LICENSE → knapsack-highs/LICENSE b/knapsack-highspy/LICENSE → knapsack-highs/LICENSE
diff --git a/knapsack-highspy/README.md → knapsack-highs/README.md b/knapsack-highspy/README.md → knapsack-highs/README.md
diff --git a/knapsack-highspy/VERSION → knapsack-highs/VERSION b/knapsack-highspy/VERSION → knapsack-highs/VERSION
diff --git a/knapsack-highspy/app.yaml → knapsack-highs/app.yaml b/knapsack-highspy/app.yaml → knapsack-highs/app.yaml
diff --git a/knapsack-highspy/input.json → knapsack-highs/input.json b/knapsack-highspy/input.json → knapsack-highs/input.json
diff --git a/...k-highspy/knapsack-highspy.code-workspace → ...ack-highs/knapsack-highspy.code-workspace b/...k-highspy/knapsack-highspy.code-workspace → ...ack-highs/knapsack-highspy.code-workspace
diff --git a/knapsack-highspy/main.py → knapsack-highs/main.py b/knapsack-highspy/main.py → knapsack-highs/main.py
diff --git a/knapsack-highspy/requirements.txt → knapsack-highs/requirements.txt b/knapsack-highspy/requirements.txt → knapsack-highs/requirements.txt