Skip to content

Commit 5adb428

Browse files
Merge branch 'develop' into nmisek/adds-python-nextroute-traveltime-app
2 parents 4392de2 + 8d05a23 commit 5adb428

File tree

237 files changed

+19681
-1085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+19681
-1085
lines changed

.github/workflows/readme-test.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
# The readme-test workflow runs all commands contained in the README files of the apps.
22
name: readme-test
3-
on:
4-
workflow_dispatch:
5-
pull_request:
6-
types: [opened, ready_for_review]
3+
on: [push, workflow_dispatch]
74
jobs:
85
readme-test:
96
runs-on: ubuntu-latest

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,11 +169,14 @@ go.work.sum
169169

170170
# Java stuff
171171
main.jar
172+
*.class
173+
*.MF
172174

173175
# Outputs
174176
!Output.Java
175177
output.json
176178
output/
179+
outputs/
177180

178181
# Ignore app binary files
179182
go-highs-orderfulfillment/go-highs-orderfulfillment

.nextmv/golden/java-ortools-knapsack/inputs/input.json.golden

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
"value": 100,
88
"weight": 20
99
},
10-
{
11-
"id": "dog",
12-
"value": 20,
13-
"weight": 45
14-
},
1510
{
1611
"id": "water",
1712
"value": 40,
@@ -32,21 +27,11 @@
3227
"value": 81,
3328
"weight": 1
3429
},
35-
{
36-
"id": "tablet",
37-
"value": 28,
38-
"weight": 8
39-
},
4030
{
4131
"id": "coat",
4232
"value": 44,
4333
"weight": 9
4434
},
45-
{
46-
"id": "laptop",
47-
"value": 51,
48-
"weight": 13
49-
},
5035
{
5136
"id": "keys",
5237
"value": 92,
@@ -58,7 +43,7 @@
5843
"weight": 4
5944
}
6045
],
61-
"value": 0
46+
"value": 444
6247
}
6348
],
6449
"statistics": {
@@ -69,7 +54,7 @@
6954
"status": "OPTIMAL",
7055
"variables": 11
7156
},
72-
"value": 0
57+
"value": 444
7358
},
7459
"run": {
7560
"duration": 0.123

0 commit comments

Comments
 (0)