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.

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

#595 - Polytopes intersect should be intersection #596

Merged
merged 4 commits into from
Aug 30, 2018
Merged

Conversation

mforets
Copy link
Member

@mforets mforets commented Aug 29, 2018

Closes #595.

@@ -366,6 +367,7 @@ VPolytope
dim(::VPolytope)
σ(::AbstractVector{Real}, ::VPolytope{Real})
vertices_list(::VPolytope)
intersection(::VPolytope, ::VPolytope)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently we cannot create docs for functions inside the @require block because we do not load Polyhedra, which again is because that package does not build in v0.7 at the moment.
So you have to remove these two lines again.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, got it

@@ -108,7 +108,7 @@ polyoverapprox(x) = HPolytope(overapproximate(x, 1e-3).constraints)

Epoly = polyoverapprox(E)
Bpoly = polyoverapprox(B)
X = intersect(Epoly, Bpoly)
X = intersecttion(Epoly, Bpoly)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

intersection

@mforets mforets merged commit d2108cf into master Aug 30, 2018
@mforets mforets deleted the mforets/595 branch August 30, 2018 13:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants