Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#482 - Support partial property mappings #500

Merged
merged 2 commits into from
Feb 26, 2019
Merged

#482 - Support partial property mappings #500

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a55cbf5
allow for partial property maps & fix index bug
schillic Feb 26, 2019
5ee1b38
fix property check call
schillic Feb 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/solve.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,13 @@ function solve!(system::InitialValueProblem{<:HybridSystem,
op=opC,
invariant=source_invariant)
inout_map = reach_tube.options[:inout_map] # TODO temporary hack
if property != nothing
# get the property for the current location
property_loc = property isa Dict ? property[loc] : property
# get the property for the current location
property_loc = property isa Dict ?
get(property, loc_id, nothing) :
property
if property_loc != nothing
for (i, reach_set) in enumerate(reach_tube.Xk)
if !check_property(reach_set.X, property_loc)
if !check(property_loc, reach_set.X)
return CheckSolution(false, i, options)
end
end
Expand Down