[installation] Change to nightly
This commit is contained in:
@ -47,7 +47,7 @@ bool transformFFT(int n, T *inout, double fsamp, const FFT::TransferFunction *tf
|
||||
template <typename T>
|
||||
bool transformFFT(std::vector<T> &inout, double fsamp, const FFT::TransferFunction *tf,
|
||||
double cutoff, double min_freq, double max_freq) {
|
||||
return transformFFT(inout.size(), &inout[0], fsamp, tf, cutoff, min_freq, max_freq);
|
||||
return transformFFT(inout.size(), inout.data(), fsamp, tf, cutoff, min_freq, max_freq);
|
||||
}
|
||||
|
||||
|
||||
@ -63,8 +63,8 @@ template <typename T>
|
||||
bool transformFFT(std::vector<T> &inout, double fsamp, const Poles &poles,
|
||||
const Zeros &zeros, double norm, double cutoff,
|
||||
double min_freq, double max_freq) {
|
||||
return transformFFT(inout.size(), &inout[0], poles.size(), &poles[0],
|
||||
zeros.size(), &zeros[0], norm, cutoff, min_freq, max_freq);
|
||||
return transformFFT(inout.size(), inout.data(), poles.size(), poles.data(),
|
||||
zeros.size(), zeros.data(), norm, cutoff, min_freq, max_freq);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ namespace Restitution {
|
||||
|
||||
// subroutines to compute parameters for the recursive filter
|
||||
|
||||
// from seismometer eigenperiod T0 and damping parameter h bool
|
||||
// from seismometer eigenperiod T0 and damping parameter h bool
|
||||
bool coefficients_from_T0_h(double fsamp, double gain, double T0, double h, double *c0, double *c1, double *c2);
|
||||
|
||||
// from the two seismometer eigenperiods T1 and T2
|
||||
@ -44,13 +44,13 @@ class TimeDomain : public Filtering::InPlaceFilter<TYPE> {
|
||||
|
||||
// configuration
|
||||
void setBandpass(int order, double fmin, double fmax);
|
||||
void setSamplingFrequency(double fsamp);
|
||||
void setCoefficients(double c0, double c1, double c2);
|
||||
|
||||
virtual int setParameters(int n, const double *params);
|
||||
virtual void setSamplingFrequency(double fsamp) override;
|
||||
virtual int setParameters(int n, const double *params) override;
|
||||
|
||||
virtual void reset() {}
|
||||
virtual void apply(int n, TYPE *inout);
|
||||
virtual void apply(int n, TYPE *inout) override;
|
||||
virtual std::string print() const;
|
||||
|
||||
protected:
|
||||
@ -79,13 +79,13 @@ class TimeDomain_from_T0_h: public TimeDomain<TYPE> {
|
||||
TimeDomain_from_T0_h(double T0, double h, double gain, double fsamp=0);
|
||||
|
||||
void setBandpass(int order, double fmin, double fmax);
|
||||
virtual std::string print() const;
|
||||
virtual std::string print() const override;
|
||||
|
||||
Filtering::InPlaceFilter<TYPE>* clone() const;
|
||||
Filtering::InPlaceFilter<TYPE>* clone() const override;
|
||||
|
||||
protected:
|
||||
virtual void init();
|
||||
|
||||
virtual void init() override;
|
||||
|
||||
private:
|
||||
// configuration
|
||||
double T0, h;
|
||||
@ -97,12 +97,12 @@ class TimeDomain_from_T1_T2: public TimeDomain<TYPE> {
|
||||
TimeDomain_from_T1_T2(double T1, double T2, double gain, double fsamp=0);
|
||||
|
||||
void setBandpass(int order, double fmin, double fmax);
|
||||
virtual std::string print() const;
|
||||
virtual std::string print() const override;
|
||||
|
||||
Filtering::InPlaceFilter<TYPE>* clone() const;
|
||||
Filtering::InPlaceFilter<TYPE>* clone() const override;
|
||||
|
||||
protected:
|
||||
virtual void init();
|
||||
virtual void init() override;
|
||||
|
||||
private:
|
||||
// configuration
|
||||
|
||||
@ -61,7 +61,7 @@ class TransferFunction : public Core::BaseObject {
|
||||
|
||||
void evaluate(std::vector<Complex> &out, const std::vector<double> &x) const {
|
||||
out.resize(x.size());
|
||||
evaluate_(&out[0], (int)x.size(), &x[0]);
|
||||
evaluate_(out.data(), (int)x.size(), x.data());
|
||||
}
|
||||
|
||||
//! Devides the spectra by the evaluated nodes of the transfer function
|
||||
@ -72,7 +72,7 @@ class TransferFunction : public Core::BaseObject {
|
||||
|
||||
//! Convenience wrapper using a vector as output
|
||||
void deconvolve(std::vector<Complex> &spec, double startFreq, double df) const {
|
||||
deconvolve_((int)spec.size(), &spec[0], startFreq, df);
|
||||
deconvolve_((int)spec.size(), spec.data(), startFreq, df);
|
||||
}
|
||||
|
||||
//! Multiplies the spectra by the evaluated nodes of the transfer function
|
||||
@ -83,7 +83,7 @@ class TransferFunction : public Core::BaseObject {
|
||||
|
||||
//! Convenience wrapper using a vector as output
|
||||
void convolve(std::vector<Complex> &spec, double startFreq, double df) const {
|
||||
convolve_((int)spec.size(), &spec[0], startFreq, df);
|
||||
convolve_((int)spec.size(), spec.data(), startFreq, df);
|
||||
}
|
||||
|
||||
|
||||
@ -101,9 +101,9 @@ class PolesAndZeros : public TransferFunction {
|
||||
PolesAndZeros(int n_poles, Pole *poles, int n_zeros, Zero *zeros, double k, int addZeros = 0);
|
||||
|
||||
protected:
|
||||
void evaluate_(Complex *out, int n, const double *x) const;
|
||||
void deconvolve_(int n, Complex *spec, double startFreq, double df) const;
|
||||
void convolve_(int n, Complex *spec, double startFreq, double df) const;
|
||||
void evaluate_(Complex *out, int n, const double *x) const override;
|
||||
void deconvolve_(int n, Complex *spec, double startFreq, double df) const override;
|
||||
void convolve_(int n, Complex *spec, double startFreq, double df) const override;
|
||||
|
||||
public:
|
||||
SeismometerResponse::PolesAndZeros paz;
|
||||
@ -120,9 +120,9 @@ class ResponseList : public TransferFunction {
|
||||
ResponseList(int n_tuples, const SeismometerResponse::FAP *faps, int addZeros = 0);
|
||||
|
||||
protected:
|
||||
void evaluate_(Complex *out, int n, const double *x) const;
|
||||
void deconvolve_(int n, Complex *spec, double startFreq, double df) const;
|
||||
void convolve_(int n, Complex *spec, double startFreq, double df) const;
|
||||
void evaluate_(Complex *out, int n, const double *x) const override;
|
||||
void deconvolve_(int n, Complex *spec, double startFreq, double df) const override;
|
||||
void convolve_(int n, Complex *spec, double startFreq, double df) const override;
|
||||
|
||||
public:
|
||||
SeismometerResponse::FAPs faps;
|
||||
|
||||
Reference in New Issue
Block a user