From 77e34e074e72249d42115e815012a129d82177ac Mon Sep 17 00:00:00 2001
From: Michiel Cottaar <MichielCottaar@protonmail.com>
Date: Sat, 25 May 2024 16:52:57 +0100
Subject: [PATCH] Fix scanner constraints settings
---
src/variables.jl | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/variables.jl b/src/variables.jl
index ba6de61..d61df2a 100644
--- a/src/variables.jl
+++ b/src/variables.jl
@@ -453,26 +453,19 @@ function make_generic end
Constraints [`gradient_strength`](@ref) and [`slew_rate`](@ref) to be less than the [`global_scanner`](@ref) maximum.
"""
function scanner_constraints!(bb::AbstractBlock)
- try
- global_scanner()
- catch e
- return
- end
- for f in (slew_rate, gradient_strength)
+ for (var, max_value) in [
+ (variables.slew_rate, global_scanner().slew_rate),
+ (variables.gradient_strength, global_scanner().gradient),
+ ]
value = nothing
try
- value = f(bb)
+ value = var(bb)
catch
continue
end
- if value isa AbstractVector
- for v in value
- @constraint global_model() v <= f(global_scanner())
- @constraint global_model() v >= -f(global_scanner())
- end
- else
- @constraint global_model() value <= f(global_scanner())
- @constraint global_model() value >= -f(global_scanner())
+ for v in value
+ @constraint global_model() v <= max_value
+ @constraint global_model() v >= -max_value
end
end
end
--
GitLab