Update rewrite branch. Working with Symbolics 5, IntervalArithmetic 0.20

JuliaIntervals · Mar 31, 2024 · 35a2876 · 35a2876
1 parent 15283da
commit 35a2876
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "IntervalConstraintProgramming"
 uuid = "138f1668-1576-5ad7-91b9-7425abbf3153"
-version = "0.13.0"
+version = "0.14"
 
 [deps]
 IntervalArithmetic = "d1acc4aa-44c8-5952-acd4-ba5d80a2a253"
@@ -13,9 +13,9 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
 IntervalArithmetic = "0.16, 0.17, 0.18, 0.19, 0.20"
 IntervalContractors = "0.4"
 MacroTools = "0.4, 0.5"
-ReversePropagation = "0.1"
-Symbolics = "1, 2, 3, 4"
-julia = "1.6, 1.7"
+ReversePropagation = "0.2"
+Symbolics = "1, 2, 3, 4, 5"
+julia = "1"
 
 [extras]
 Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"

diff --git a/src/IntervalConstraintProgramming.jl b/src/IntervalConstraintProgramming.jl
@@ -8,7 +8,7 @@ using   IntervalArithmetic,
 using Symbolics
 using Symbolics: operation, value, arguments, toexpr, Sym
 
-using Symbolics: @register
+using Symbolics: @register_symbolic
 
 using ReversePropagation
 
@@ -20,12 +20,12 @@ import Base:
 import IntervalArithmetic: sqr, setindex
 
 
-@register ¬(x)
-@register x & y
-@register x | y
-@register x ∈ y::Interval
-@register x ∨ y
-@register x ∧ y
+@register_symbolic ¬(x)
+# @register_symbolic x & y
+# @register_symbolic x | y
+@register_symbolic x ∈ y::Interval
+@register_symbolic x ∨ y
+@register_symbolic x ∧ y
 
 export
     # BasicContractor,

diff --git a/src/model.jl b/src/model.jl
@@ -1,7 +1,7 @@
 
 
 struct Model
-    vars::Set{Sym{Real, Nothing}}
+    vars::Set{Sym{Real}}
     params 
     constraints 
 end