Skip to content

Commit 337134e

Browse files
authored
Merge pull request #7 from gamma-opt/model_test
Model test merging to master (Nov/2021)
2 parents 1214dab + 71f9cbd commit 337134e

File tree

150 files changed

+515
-220933
lines changed

Some content is hidden

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

150 files changed

+515
-220933
lines changed

.DS_Store

-2 KB
Binary file not shown.

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
## Project
2-
scratch/
3-
output/
42
!docs/src/output
53
.ipynb_checkpoints
64
*.ipynb
5+
.vscode
76

87
## Julia
98
# Files generated by invoking Julia with --code-coverage
@@ -39,3 +38,9 @@ Manifest.toml
3938

4039
# Triton files
4140
.triton/
41+
42+
# Directory with basic structure files
43+
.basic_specs/
44+
45+
# Hide big files from Git
46+
.big_files/

.vscode/settings.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
<<<<<<< Updated upstream
21
{
3-
"python.pythonPath": "C:\\Users\\ludic\\miniconda3\\python.exe"
4-
}
5-
=======
6-
{}
7-
>>>>>>> Stashed changes
2+
"python.pythonPath": "C:\\Users\\ludic\\miniconda3\\python.exe",
3+
"julia.environmentPath": "\\\\data.triton.aalto.fi\\scratch\\work\\condeil1\\EnergySystemModeling.jl"
4+
}

Project.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
88
Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
99
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
1010
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
11+
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
1112
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
1213
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
1314
Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"

examples/.DS_Store

0 Bytes
Binary file not shown.

examples/structures/.DS_Store

6 KB
Binary file not shown.

examples/structures/._.DS_Store

4 KB
Binary file not shown.
6 KB
Binary file not shown.
4 KB
Binary file not shown.

examples/structures/8nodes/instances/08n8670h0168_cmm/README.md

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

0 commit comments

Comments
 (0)