Skip to content

Commit 67b0e0e

Browse files
committed
remove comments
1 parent 76f1a63 commit 67b0e0e

File tree

2 files changed

+2
-49
lines changed

2 files changed

+2
-49
lines changed

include/convex_bodies/hpolytope.h

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -573,61 +573,23 @@ class HPolytope {
573573
VT& Ar,
574574
VT& Av,
575575
NT const& lambda_prev,
576-
VT& distances_vec,
577576
set_type& distances_set,
578577
AA_type const& AA,
579578
update_parameters& params) const
580579
{
581580
NT inner_prev = params.inner_vi_ak;
582-
583-
// real Ar = Ar + params.moved_dist * Av
584-
// real r = r + params.moved_dist * v
585-
// real distances_vec = distances_vec - params.moved_dist
586581

587582
NT* Av_data = Av.data();
588-
//NT* Ar_data = Ar.data();
589-
//NT* dvec_data = distances_vec.data();
590583
const NT* b_data = b.data();
591584

592585
for (Eigen::SparseMatrix<double>::InnerIterator it(AA, params.facet_prev); it; ++it) {
593586

594-
// NT old_Av = *(Av_data + it.row());
595-
596587
*(Av_data + it.row()) += (-2.0 * inner_prev) * it.value();
597-
//*(Ar_data + it.row()) -= (-2.0 * inner_prev * params.moved_dist) * it.value();
598-
599-
//if(*(dvec_data + it.row()) > params.moved_dist - lambda_prev)
600-
// distances_set.erase(std::make_pair(*(dvec_data + it.row()), it.row()));
601-
602-
// *(dvec_data + it.row()) = (*(b_data + it.row()) - *(Ar_data + it.row())) / *(Av_data + it.row());
603-
// *(dvec_data + it.row()) = (*(dvec_data + it.row()) - params.moved_dist) * old_Av / *(Av_data + it.row()) + params.moved_dist;
604-
// *(dvec_data + it.row()) += (*(dvec_data + it.row()) - params.moved_dist) * 2.0 * inner_prev * it.value() / *(Av_data + it.row());
605-
606588
NT val = distances_set.get_val(it.row());
607589
val += (val - params.moved_dist) * 2.0 * inner_prev * it.value() / *(Av_data + it.row());
608590
distances_set.change_val(it.row(), val, params.moved_dist);
609-
610-
//if(*(dvec_data + it.row()) > params.moved_dist)
611-
// distances_set.insert(std::make_pair(*(dvec_data + it.row()), it.row()));
612591
}
613-
/*
614-
std::cout << "got here post!!" << std::endl;
615-
std::cout << std::endl;
616-
std::cout << distances_set.heap_size << std::endl;
617-
std::cout << params.moved_dist << std::endl;
618-
std::cout << lambda_prev << std::endl;
619-
for(int i = 0; i < num_of_hyperplanes(); ++i) {
620-
std::cout << distances_set.heap[i].first << ' ';
621-
}
622-
std::cout << std::endl << std::endl;*/
623-
624-
/*auto it = distances_set.upper_bound(std::make_pair(-9999999, 0));
625-
626-
if(it == distances_set.end()) {
627-
std::cout << "something went wrong when trying to get lowest positive value" << std::endl;
628-
throw "all values from the set were negative";
629-
}
630-
*/
592+
631593
std::pair<NT, int> ans = distances_set.get_min();
632594
ans.first -= params.moved_dist;
633595

include/random_walks/uniform_accelerated_billiard_walk.hpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,19 +233,12 @@ struct AcceleratedBilliardWalk
233233
_lambda_prev = dl * pbpair.first;
234234
if constexpr (std::is_same<MT, Eigen::SparseMatrix<NT, Eigen::RowMajor>>::value) {
235235
_update_parameters.moved_dist = _lambda_prev;
236-
//_distances_set.clear();
237-
_distances_vec.setZero(P.num_of_hyperplanes());
238236
typename Point::Coeff b = P.get_vec();
239237
NT* b_data = b.data();
240-
//NT* dvec_data = _distances_vec.data();
241238
NT* Ar_data = _lambdas.data();
242239
NT* Av_data = _Av.data();
243240
for(int i = 0; i < P.num_of_hyperplanes(); ++i) {
244241
_distances_set.vec[i].first = ( *(b_data + i) - (*(Ar_data + i)) ) / (*(Av_data + i));
245-
//std::cout << _distances_set.vec[i].first << ' ';
246-
//*(dvec_data + i) = ( *(b_data + i) - (*(Ar_data + i)) ) / (*(Av_data + i));
247-
//if(*(dvec_data + i) > _update_parameters.moved_dist)
248-
// _distances_set.insert(std::make_pair(*(dvec_data + i), i));
249242
}
250243
_distances_set.rebuild(_update_parameters.moved_dist);
251244
} else {
@@ -259,7 +252,7 @@ struct AcceleratedBilliardWalk
259252
{
260253
std::pair<NT, int> pbpair;
261254
if constexpr (std::is_same<MT, Eigen::SparseMatrix<NT, Eigen::RowMajor>>::value) {
262-
pbpair = P.line_positive_intersect(_p, _lambdas, _Av, _lambda_prev, _distances_vec,
255+
pbpair = P.line_positive_intersect(_p, _lambdas, _Av, _lambda_prev,
263256
_distances_set, _AA, _update_parameters);
264257
} else {
265258
pbpair = P.line_positive_intersect(_p, _v, _lambdas, _Av, _lambda_prev,
@@ -450,9 +443,7 @@ struct AcceleratedBilliardWalk
450443
update_parameters _update_parameters;
451444
typename Point::Coeff _lambdas;
452445
typename Point::Coeff _Av;
453-
typename Point::Coeff _distances_vec;
454446
Heap<NT> _distances_set;
455-
//std::set<std::pair<NT, int>> _distances_set;
456447
};
457448

458449
};

0 commit comments

Comments
 (0)