Skip to content

Commit 0178a02

Browse files
holgerteichgraeberholgerteichgraeber
authored
Merge pull request #74 from holgerteichgraeber/dev
Seperated ClustForOpt and CEP
2 parents 20fb12f + 8bfd7fd commit 0178a02

Some content is hidden

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

96 files changed

+789982
-138356
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
*.swn
66
*.swo
77
*.eps
8+
*.png
9+
test.jl
810
docs/build/

‎.travis.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ language: julia
22

33
os:
44
- linux
5-
- osx
65

76
julia:
87
- 1.0
@@ -11,8 +10,6 @@ notifications:
1110
email: false
1211

1312
after_success:
14-
- julia --project=coverage/ -e 'using Pkg; Pkg.instantiate()'
15-
- julia --project=coverage/ coverage/coverage.jl
1613

1714
jobs:
1815
include:
@@ -22,6 +19,12 @@ jobs:
2219
script:
2320
- julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
2421
- julia --project=docs/ docs/make.jl
25-
name: "HTML"
22+
after_success:
23+
- stage: "Testing"
24+
julia: 1.0
25+
os: linux
26+
script:
27+
- julia --project=test/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
28+
- julia --project=test/ test/clustering.jl
2629
after_success:
2730
services: docker

‎Manifest.toml‎

Lines changed: 316 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,316 @@
1+
[[Base64]]
2+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
3+
4+
[[BinDeps]]
5+
deps = ["Compat", "Libdl", "SHA", "URIParser"]
6+
git-tree-sha1 = "12093ca6cdd0ee547c39b1870e0c9c3f154d9ca9"
7+
uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
8+
version = "0.8.10"
9+
10+
[[BinaryProvider]]
11+
deps = ["Libdl", "Pkg", "SHA", "Test"]
12+
git-tree-sha1 = "055eb2690182ebc31087859c3dd8598371d3ef9e"
13+
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
14+
version = "0.5.3"
15+
16+
[[CSV]]
17+
deps = ["CategoricalArrays", "DataFrames", "DataStreams", "Dates", "Mmap", "Parsers", "Profile", "Random", "Tables", "Test", "Unicode", "WeakRefStrings"]
18+
git-tree-sha1 = "b92c6f626a044cc9619156d54994b94084d40abe"
19+
uuid = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
20+
version = "0.4.3"
21+
22+
[[Calculus]]
23+
deps = ["Compat"]
24+
git-tree-sha1 = "f60954495a7afcee4136f78d1d60350abd37a409"
25+
uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
26+
version = "0.4.1"
27+
28+
[[CategoricalArrays]]
29+
deps = ["Compat", "Future", "Missings", "Printf", "Reexport", "Requires"]
30+
git-tree-sha1 = "94d16e77dfacc59f6d6c1361866906dbb65b6f6b"
31+
uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597"
32+
version = "0.5.2"
33+
34+
[[Clustering]]
35+
deps = ["Dates", "Distances", "LinearAlgebra", "NearestNeighbors", "Printf", "Random", "SparseArrays", "Statistics", "StatsBase", "Test"]
36+
git-tree-sha1 = "5c4c26ffc9075f5a425efdc6e40c6f8f11fa52ec"
37+
uuid = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5"
38+
version = "0.13.1"
39+
40+
[[CodecZlib]]
41+
deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"]
42+
git-tree-sha1 = "36bbf5374c661054d41410dc53ff752972583b9b"
43+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
44+
version = "0.5.2"
45+
46+
[[CommonSubexpressions]]
47+
deps = ["Test"]
48+
git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0"
49+
uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
50+
version = "0.2.0"
51+
52+
[[Compat]]
53+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
54+
git-tree-sha1 = "84aa74986c5b9b898b0d1acaf3258741ee64754f"
55+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
56+
version = "2.1.0"
57+
58+
[[DataFrames]]
59+
deps = ["CategoricalArrays", "CodecZlib", "Compat", "DataStreams", "Dates", "InteractiveUtils", "IteratorInterfaceExtensions", "LinearAlgebra", "Missings", "Printf", "Random", "Reexport", "SortingAlgorithms", "Statistics", "StatsBase", "TableTraits", "Tables", "Test", "TranscodingStreams", "Unicode", "WeakRefStrings"]
60+
git-tree-sha1 = "9cfed75401d25d281076eb5d82de148ac2933f9e"
61+
uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
62+
version = "0.17.1"
63+
64+
[[DataStreams]]
65+
deps = ["Dates", "Missings", "Test", "WeakRefStrings"]
66+
git-tree-sha1 = "69c72a1beb4fc79490c361635664e13c8e4a9548"
67+
uuid = "9a8bc11e-79be-5b39-94d7-1ccc349a1a85"
68+
version = "0.4.1"
69+
70+
[[DataStructures]]
71+
deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
72+
git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038"
73+
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
74+
version = "0.15.0"
75+
76+
[[Dates]]
77+
deps = ["Printf"]
78+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
79+
80+
[[DelimitedFiles]]
81+
deps = ["Mmap"]
82+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
83+
84+
[[DiffResults]]
85+
deps = ["Compat", "StaticArrays"]
86+
git-tree-sha1 = "34a4a1e8be7bc99bc9c611b895b5baf37a80584c"
87+
uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
88+
version = "0.0.4"
89+
90+
[[DiffRules]]
91+
deps = ["Random", "Test"]
92+
git-tree-sha1 = "dc0869fb2f5b23466b32ea799bd82c76480167f7"
93+
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
94+
version = "0.0.10"
95+
96+
[[Distances]]
97+
deps = ["LinearAlgebra", "Printf", "Random", "Statistics", "Test"]
98+
git-tree-sha1 = "a135c7c062023051953141da8437ed74f89d767a"
99+
uuid = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
100+
version = "0.8.0"
101+
102+
[[Distributed]]
103+
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
104+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
105+
106+
[[FileIO]]
107+
deps = ["Pkg", "Random", "Test"]
108+
git-tree-sha1 = "da32159d4a2e526338506685e280e39ed2f18961"
109+
uuid = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
110+
version = "1.0.6"
111+
112+
[[ForwardDiff]]
113+
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "InteractiveUtils", "LinearAlgebra", "NaNMath", "Random", "SparseArrays", "SpecialFunctions", "StaticArrays", "Test"]
114+
git-tree-sha1 = "4c4d727f1b7e0092134fabfab6396b8945c1ea5b"
115+
uuid = "f6369f11-7733-5829-9624-2563aa707210"
116+
version = "0.10.3"
117+
118+
[[Future]]
119+
deps = ["Random"]
120+
uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820"
121+
122+
[[InteractiveUtils]]
123+
deps = ["LinearAlgebra", "Markdown"]
124+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
125+
126+
[[IteratorInterfaceExtensions]]
127+
deps = ["Test"]
128+
git-tree-sha1 = "5484e5ede2a4137b9643f4d646e8e7b87b794415"
129+
uuid = "82899510-4779-5014-852e-03e436cf321d"
130+
version = "0.1.1"
131+
132+
[[JLD2]]
133+
deps = ["CodecZlib", "DataStructures", "FileIO", "LinearAlgebra", "Mmap", "Printf", "Random", "Test"]
134+
git-tree-sha1 = "3ba90ff93e1d5b9b2103588051c2d349fae54dac"
135+
uuid = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
136+
version = "0.1.2"
137+
138+
[[JuMP]]
139+
deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "NaNMath", "Random", "SparseArrays", "Statistics", "Test"]
140+
git-tree-sha1 = "db9f08540c1a23269acbae5d520c79f4722899f4"
141+
uuid = "4076af6c-e467-56ae-b986-b466b2749572"
142+
version = "0.19.0"
143+
144+
[[LibGit2]]
145+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
146+
147+
[[Libdl]]
148+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
149+
150+
[[LinearAlgebra]]
151+
deps = ["Libdl"]
152+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
153+
154+
[[Logging]]
155+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
156+
157+
[[Markdown]]
158+
deps = ["Base64"]
159+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
160+
161+
[[MathOptInterface]]
162+
deps = ["Compat", "Unicode"]
163+
git-tree-sha1 = "5d3de69c9220610d0336ab45d3eb8b6ac7a7c807"
164+
uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
165+
version = "0.8.4"
166+
167+
[[Missings]]
168+
deps = ["Dates", "InteractiveUtils", "SparseArrays", "Test"]
169+
git-tree-sha1 = "d1d2585677f2bd93a97cfeb8faa7a0de0f982042"
170+
uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28"
171+
version = "0.4.0"
172+
173+
[[Mmap]]
174+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
175+
176+
[[NaNMath]]
177+
deps = ["Compat"]
178+
git-tree-sha1 = "ce3b85e484a5d4c71dd5316215069311135fa9f2"
179+
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
180+
version = "0.3.2"
181+
182+
[[NearestNeighbors]]
183+
deps = ["Distances", "LinearAlgebra", "Mmap", "StaticArrays", "Test"]
184+
git-tree-sha1 = "f47c5d97cf9a8caefa47e9fa9d99d8fda1a65154"
185+
uuid = "b8a86587-4115-5ab1-83bc-aa920d37bbce"
186+
version = "0.4.3"
187+
188+
[[OrderedCollections]]
189+
deps = ["Random", "Serialization", "Test"]
190+
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
191+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
192+
version = "1.1.0"
193+
194+
[[Parsers]]
195+
deps = ["Dates", "Mmap", "Test", "WeakRefStrings"]
196+
git-tree-sha1 = "d4e634c9cab597f0ec8f5a1d62c0787e98602c55"
197+
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
198+
version = "0.2.22"
199+
200+
[[Pkg]]
201+
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
202+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
203+
204+
[[Printf]]
205+
deps = ["Unicode"]
206+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
207+
208+
[[Profile]]
209+
deps = ["Printf"]
210+
uuid = "9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"
211+
212+
[[REPL]]
213+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
214+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
215+
216+
[[Random]]
217+
deps = ["Serialization"]
218+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
219+
220+
[[Reexport]]
221+
deps = ["Pkg"]
222+
git-tree-sha1 = "7b1d07f411bc8ddb7977ec7f377b97b158514fe0"
223+
uuid = "189a3867-3050-52da-a836-e630ba90ab69"
224+
version = "0.2.0"
225+
226+
[[Requires]]
227+
deps = ["Test"]
228+
git-tree-sha1 = "f6fbf4ba64d295e146e49e021207993b6b48c7d1"
229+
uuid = "ae029012-a4dd-5104-9daa-d747884805df"
230+
version = "0.5.2"
231+
232+
[[SHA]]
233+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
234+
235+
[[Serialization]]
236+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
237+
238+
[[SharedArrays]]
239+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
240+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
241+
242+
[[Sockets]]
243+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
244+
245+
[[SortingAlgorithms]]
246+
deps = ["DataStructures", "Random", "Test"]
247+
git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd"
248+
uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c"
249+
version = "0.3.1"
250+
251+
[[SparseArrays]]
252+
deps = ["LinearAlgebra", "Random"]
253+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
254+
255+
[[SpecialFunctions]]
256+
deps = ["BinDeps", "BinaryProvider", "Libdl", "Test"]
257+
git-tree-sha1 = "0b45dc2e45ed77f445617b99ff2adf0f5b0f23ea"
258+
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
259+
version = "0.7.2"
260+
261+
[[StaticArrays]]
262+
deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"]
263+
git-tree-sha1 = "3841b39ed5f047db1162627bf5f80a9cd3e39ae2"
264+
uuid = "90137ffa-7385-5640-81b9-e52037218182"
265+
version = "0.10.3"
266+
267+
[[Statistics]]
268+
deps = ["LinearAlgebra", "SparseArrays"]
269+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
270+
271+
[[StatsBase]]
272+
deps = ["DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"]
273+
git-tree-sha1 = "8a0f4b09c7426478ab677245ab2b0b68552143c7"
274+
uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
275+
version = "0.30.0"
276+
277+
[[TableTraits]]
278+
deps = ["IteratorInterfaceExtensions", "Test"]
279+
git-tree-sha1 = "eba4b1d0a82bdd773307d652c6e5f8c82104c676"
280+
uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
281+
version = "0.4.1"
282+
283+
[[Tables]]
284+
deps = ["IteratorInterfaceExtensions", "LinearAlgebra", "Requires", "TableTraits", "Test"]
285+
git-tree-sha1 = "4129c340d3960a49c0c5dbe71df2b3784bdc11c0"
286+
uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
287+
version = "0.1.19"
288+
289+
[[Test]]
290+
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
291+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
292+
293+
[[TranscodingStreams]]
294+
deps = ["Random", "Test"]
295+
git-tree-sha1 = "a25d8e5a28c3b1b06d3859f30757d43106791919"
296+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
297+
version = "0.9.4"
298+
299+
[[URIParser]]
300+
deps = ["Test", "Unicode"]
301+
git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69"
302+
uuid = "30578b45-9adc-5946-b283-645ec420af67"
303+
version = "0.4.0"
304+
305+
[[UUIDs]]
306+
deps = ["Random"]
307+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
308+
309+
[[Unicode]]
310+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
311+
312+
[[WeakRefStrings]]
313+
deps = ["Missings", "Random", "Test"]
314+
git-tree-sha1 = "960639a12ffd223ee463e93392aeb260fa325566"
315+
uuid = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
316+
version = "0.5.8"

‎Project.toml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name = "ClustForOpt"
2+
uuid = "f34a0dec-cdff-52ca-a698-8a683c311173"
3+
keywords = ["clustering", "JuMP", "optimization"]
4+
license = "MIT"
5+
desc = "julia implementation of using different clustering methods for finding representative periods for the optimization of energy systems"
6+
author = ["Holger Teichgraeber"]
7+
version = "0.2.3"
8+
9+
[deps]
10+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
11+
Clustering = "aaaa29a8-35af-508c-8bc3-b662a17a0fe5"
12+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
13+
Distances = "b4f34e82-e78d-54a5-968a-f98e89d6e8f7"
14+
FileIO = "5789e2e9-d7fb-5bc7-8068-2c6fae9b9549"
15+
JLD2 = "033835bb-8acc-5ee8-8aae-3f567f8a3819"
16+
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
17+
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
18+
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
19+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
20+

‎REQUIRE‎

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

0 commit comments

Comments
 (0)