Marginal diagnostics and optimizations #108
Merged
+617
−813
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TolisChal
reviewed
Sep 3, 2020
R-proj/R/gen_birkhoff.R
Outdated
|
|
||
| return(P) | ||
|
|
||
| } |
TolisChal
reviewed
Sep 3, 2020
R-proj/src/rounding.cpp
Outdated
| InnerBall = HP.ComputeInnerBall(); | ||
| if (InnerBall.second < 0.0) throw Rcpp::exception("Unable to compute a feasible point."); | ||
| if (method_rcpp.compare(std::string("max_ellipsoid")) == 0) { | ||
| round_res = max_inscribed_ellipsoid_rounding<MT, VT>(HP, InnerBall); |
There was a problem hiding this comment.
Why InnerBall as input? The mentod needs an interior point
There was a problem hiding this comment.
Yes I have changed it. Thanks.
TolisChal
reviewed
Sep 3, 2020
| @@ -109,7 +109,7 @@ std::tuple<MT, VT, NT> min_sampling_covering_ellipsoid_rounding(Polytope &P, | |||
| T = T * L_1.transpose(); | |||
|
|
|||
| P.linear_transformIt(L_1.transpose()); | |||
| P.normalize(); | |||
| //P.normalize(); | |||
TolisChal
reviewed
Sep 3, 2020
include/preprocess/svd_rounding.hpp
Outdated
| P.linear_transformIt(round_mat); | ||
| P.normalize(); | ||
| P.ComputeInnerBall(); | ||
| //P.normalize(); |
vissarion
approved these changes
Sep 3, 2020
| kind_gen = 7 | ||
| m_gen = 0 | ||
|
|
||
| Mat = poly_gen(kind_gen, FALSE, FALSE, n, m_gen) |
There was a problem hiding this comment.
is this working for any value of n? If not comment on it.
R-proj/src/psrf_univariate.cpp
Outdated
| //' @export | ||
| // [[Rcpp::export]] | ||
| Rcpp::NumericVector psrf_univariate(Rcpp::NumericMatrix samples, | ||
| Rcpp::Nullable<std::string> method = R_NilValue) |
vissarion
pushed a commit
that referenced
this pull request
Oct 26, 2020
* improve implementations * improve computation of inner ball for H-polytopes * improve inner ball computation and improve tests * update termination criterions in rounding methods * update Rd file of Birkhoff R generator * improve univariate psrf implemetations * fix c++ tests * update parameters in rounding and minor improvements * fix gcc tests and improve birkhoff generator Rd file * fix c++ tests * improve R tests, remove ine and ext files * fix c++ tests * fix c++ tests for clang * fix c++ tests * merge and improve R examples * change r tests and examples for inner_ball function * improve R examples * change priority in inner ball computation * use only lpsolve for inner ball computation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR contains: