Skip to content

Commit faf3bae

Browse files
authored
Merge pull request #88 from JuliaConstraints/dev
New release
2 parents 4cab7b6 + 35f31eb commit faf3bae

File tree

9 files changed

+67
-525
lines changed

9 files changed

+67
-525
lines changed

Project.toml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "CompositionalNetworks"
22
uuid = "4b67e4b5-442d-4ef5-b760-3f5df3a57537"
33
authors = ["Jean-François Baffier"]
4-
version = "0.6.0"
4+
version = "0.6.1"
55

66
[deps]
77
ConstraintCommons = "e37357d9-0691-492f-a822-e5ea6a920954"
@@ -17,30 +17,21 @@ Unrolled = "9602ed7d-8fef-5bc8-8597-8f21381861e8"
1717

1818
[weakdeps]
1919
Evolutionary = "86b6b26d-c046-49b6-aa0b-5f0f74682bd6"
20-
# LocalSearchSolvers = "2b10edaa-728d-4283-ac71-07e312d6ccf3"
21-
# JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
22-
# Juniper = "2ddba703-00a4-53a7-87a5-e8b9971dde84"
23-
# Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
24-
# Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
20+
LocalSearchSolvers = "2b10edaa-728d-4283-ac71-07e312d6ccf3"
2521

2622
[extensions]
2723
GeneticExt = "Evolutionary"
28-
# LocalSearchSolversExt = "LocalSearchSolvers"
29-
# JuMPExt = ["JuMP", "Juniper", "Ipopt", "Gurobi"]
24+
LocalSearchSolversExt = "LocalSearchSolvers"
3025

3126
[compat]
3227
LocalSearchSolvers = "0.4"
3328
Evolutionary = "0.11"
34-
# JuMP = "1"
35-
# Juniper = "0.9"
36-
# Ipopt = "1"
37-
# Gurobi = "1.7"
38-
ConstraintCommons = "0.2, 0.3"
39-
ConstraintDomains = "0.3, 0.4"
29+
ConstraintCommons = "0.3"
30+
ConstraintDomains = "0.4"
4031
Dictionaries = "0.4"
4132
Distances = "0.10"
42-
ExproniconLite = "0.10.13"
43-
JuliaFormatter = "1, 2"
33+
ExproniconLite = "0.10"
34+
JuliaFormatter = "2"
4435
OrderedCollections = "1"
4536
Random = "1"
4637
TestItems = "1"
@@ -51,10 +42,6 @@ julia = "1.10"
5142
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
5243
Evolutionary = "86b6b26d-c046-49b6-aa0b-5f0f74682bd6"
5344
LocalSearchSolvers = "2b10edaa-728d-4283-ac71-07e312d6ccf3"
54-
# JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
55-
# Juniper = "2ddba703-00a4-53a7-87a5-e8b9971dde84"
56-
# Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
57-
# Gurobi = "2e9cd046-0924-5485-92f1-d5272153d98b"
5845
ExplicitImports = "7d51a73a-1435-4ff3-83d9-f097790105c7"
5946
JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
6047
Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73"
@@ -68,7 +55,7 @@ test = [
6855
"ExplicitImports",
6956
"JET",
7057
"Evolutionary",
71-
# "LocalSearchSolvers",
58+
"LocalSearchSolvers",
7259
"Memoization",
7360
"Test",
7461
"TestItemRunner",

ext/JuMPExt.jl

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

ext/LocalSearchSolversExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ parameter_specific_operations(x; X = nothing) = 0.0
2525
function CompositionalNetworks.optimize!(
2626
icn::T,
2727
configurations::Configurations,
28-
metric_function::Function,
28+
metric_function::Union{Function, Vector{Function}},
2929
optimizer_config::LocalSearchOptimizer;
3030
parameters...
3131
) where {T <: AbstractICN}

old/composition.jl

Lines changed: 0 additions & 1 deletion
This file was deleted.

old/layer.jl

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

0 commit comments

Comments
 (0)