Skip to content

Commit 265e69b

Browse files
committed
removed timing and cleaned up
1 parent a776f89 commit 265e69b

File tree

4 files changed

+0
-21
lines changed

4 files changed

+0
-21
lines changed

src/parameter_tracer.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#include <sys/stat.h>
21
#include <string>
3-
#include <cstdlib>
4-
#include <sstream>
52
#include "parameter_tracer.h"
63
using namespace arma;
74

src/particle.cpp

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@ Particle::Particle(const Options& options, const StaticParameters& parameters,
3333
}
3434
}
3535

36-
std::vector<std::pair<std::string, int>>::const_iterator findIntInPairs(const std::vector<std::pair<std::string, int>>& vec, int a) {
37-
return std::find_if(vec.begin(), vec.end(), [a](const std::pair<std::string, int>& element) {
38-
return element.second == a;
39-
});
40-
}
41-
4236
void Particle::run_particle_filter(
4337
unsigned int t, const Prior& prior,
4438
const std::unique_ptr<Data>& data,

src/run_smc.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
// [[Rcpp::depends(RcppArmadillo)]]
22
#include <RcppArmadillo.h>
3-
#include <numeric>
4-
#include <limits>
5-
#include <chrono>
63
#include "prior.h"
74
#include "data.h"
85
#include "distances.h"
@@ -46,7 +43,6 @@ Rcpp::List run_smc(
4643

4744
for(size_t t{}; t < T; t++) {
4845
reporter.report_time(t);
49-
auto start = std::chrono::steady_clock::now();
5046

5147
for(auto& p : particle_vector) {
5248
p.run_particle_filter(t, prior, data, pfun, distfun, resampler,
@@ -115,9 +111,6 @@ Rcpp::List run_smc(
115111
tracer.update_trace(particle_vector, t);
116112
n_particle_filters(t) = options.n_particle_filters;
117113

118-
auto end = std::chrono::steady_clock::now();
119-
auto duration = std::chrono::duration_cast<std::chrono::nanoseconds>(end - start).count();
120-
iteration_times.push_back(static_cast<double>(duration));
121114
}
122115

123116
mat alpha(prior.n_clusters, particle_vector.size());
@@ -146,7 +139,6 @@ Rcpp::List run_smc(
146139
Rcpp::Named("ESS") = ESS,
147140
Rcpp::Named("resampling") = resampling,
148141
Rcpp::Named("n_particle_filters") = n_particle_filters,
149-
Rcpp::Named("iteration_times") = iteration_times,
150142
Rcpp::Named("importance_weights") = exp(normalize_log_importance_weights(particle_vector)),
151143
Rcpp::Named("log_marginal_likelihood") = log_marginal_likelihood,
152144
Rcpp::Named("alpha_traces") = tracer.alpha_traces,

src/sample_latent_rankings.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
#include <RcppArmadillo.h>
2-
#include <filesystem>
3-
#include <vector>
4-
#include <iterator>
52
#include "sample_latent_rankings.h"
63
#include "data.h"
74
#include "misc.h"
85
using namespace arma;
9-
namespace fs = std::filesystem;
106

117
uvec shuffle_rcpp(const uvec& values_in) {
128
ivec inds = Rcpp::sample(values_in.size(), values_in.size(), false) - 1;

0 commit comments

Comments
 (0)