From 89f6ee8b76cc5c807e7eb4cd6ea06d60a7b0e7c9 Mon Sep 17 00:00:00 2001 From: Dongryeol Lee Date: Thu, 17 Jan 2008 23:39:13 +0000 Subject: [PATCH] Took out the parts that are currently under development --- .../series_expansion/farfield_expansion.h | 49 ------------------- .../series_expansion/local_expansion.h | 44 ----------------- .../mult_farfield_expansion.h | 44 ----------------- .../series_expansion/mult_local_expansion.h | 44 ----------------- 4 files changed, 181 deletions(-) diff --git a/fastlib/u/dongryel/series_expansion/farfield_expansion.h b/fastlib/u/dongryel/series_expansion/farfield_expansion.h index ca72e2bfb6..e42a534d15 100644 --- a/fastlib/u/dongryel/series_expansion/farfield_expansion.h +++ b/fastlib/u/dongryel/series_expansion/farfield_expansion.h @@ -23,9 +23,6 @@ template class FarFieldExpansion { private: - - /** basis vectors spanning */ - Matrix basis_vectors_; /** The center of the expansion */ Vector center_; @@ -46,7 +43,6 @@ class FarFieldExpansion { const typename TKernelAux::TSeriesExpansionAux *sea_; OT_DEF(FarFieldExpansion) { - OT_MY_OBJECT(basis_vectors_); OT_MY_OBJECT(center_); OT_MY_OBJECT(coeffs_); OT_MY_OBJECT(order_); @@ -58,9 +54,6 @@ class FarFieldExpansion { /** Get the coefficients */ double bandwidth_sq() const { return kernel_->bandwidth_sq(); } - - /** get basis vectors of this expansion */ - const Matrix& get_basis_vectors() { return basis_vectors_; } /** Get the center of expansion */ Vector* get_center() { return ¢er_; } @@ -140,7 +133,6 @@ class FarFieldExpansion { */ void Init(const Vector& center, const TKernelAux &ka); void Init(const TKernelAux &ka); - void Init(const Vector& center, const Matrix &basis, const TKernelAux &ka); /** * Computes the required order for evaluating the far field expansion @@ -173,12 +165,6 @@ class FarFieldExpansion { */ void PrintDebug(const char *name="", FILE *stream=stderr) const; - /** - * Rotate from another far field expansion so that its farfield moments - * expressed in terms of the basis vectors owned here. - */ - void RotateFromFarField(const FarFieldExpansion &se); - /** * Translate from a far field expansion to the expansion here. * The translated coefficients are added up to the ones here. @@ -900,24 +886,6 @@ double FarFieldExpansion::ConvolveField return sum; } -template -void FarFieldExpansion::Init(const Vector& center, - const Matrix& basis_vectors, - const TKernelAux &ka) { - - // copy kernel type, center, and bandwidth squared - kernel_ = &(ka.kernel_); - center_.Copy(center); - order_ = -1; - sea_ = &(ka.sea_); - ka_ = &ka; - basis_vectors_.Alias(basis_vectors); - - // initialize coefficient array - coeffs_.Init(sea_->get_max_total_num_coeffs()); - coeffs_.SetZero(); -} - template void FarFieldExpansion::Init(const Vector& center, const TKernelAux &ka) { @@ -928,10 +896,6 @@ void FarFieldExpansion::Init(const Vector& center, order_ = -1; sea_ = &(ka.sea_); ka_ = &ka; - - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); @@ -948,10 +912,6 @@ void FarFieldExpansion::Init(const TKernelAux &ka) { center_.Init(sea_->get_dimension()); center_.SetZero(); ka_ = &ka; - - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); @@ -1037,15 +997,6 @@ void FarFieldExpansion::PrintDebug(const char *name, fprintf(stream, "\n"); } -template -void FarFieldExpansion::RotateFromFarField -(const FarFieldExpansion &se) { - - // if the basis vectors are aligned already, then noting to - // rotate - -} - template void FarFieldExpansion::TranslateFromFarField (const FarFieldExpansion &se) { diff --git a/fastlib/u/dongryel/series_expansion/local_expansion.h b/fastlib/u/dongryel/series_expansion/local_expansion.h index 3e7eb17c0a..ad4f7a6244 100644 --- a/fastlib/u/dongryel/series_expansion/local_expansion.h +++ b/fastlib/u/dongryel/series_expansion/local_expansion.h @@ -24,9 +24,6 @@ class LocalExpansion { private: - /** the basis vectors */ - Matrix basis_vectors_; - /** The center of the expansion */ Vector center_; @@ -46,7 +43,6 @@ class LocalExpansion { const typename TKernelAux::TSeriesExpansionAux *sea_; OT_DEF(LocalExpansion) { - OT_MY_OBJECT(basis_vectors_); OT_MY_OBJECT(center_); OT_MY_OBJECT(coeffs_); OT_MY_OBJECT(order_); @@ -103,8 +99,6 @@ class LocalExpansion { */ void Init(const Vector& center, const TKernelAux &ka); void Init(const TKernelAux &ka); - void Init(const Vector& center, const Matrix& basis_vectors, - const TKernelAux &ka); /** * Computes the required order for evaluating the local expansion @@ -121,12 +115,6 @@ class LocalExpansion { */ void PrintDebug(const char *name="", FILE *stream=stderr) const; - /** - * rotate from another local expansion such that its local moments - * expressed in terms of the basis vectors here. - */ - void RotateFromLocal(const LocalExpansion &se); - /** * Translate from a far field expansion to the expansion here. * The translated coefficients are added up to the ones here. @@ -357,24 +345,6 @@ double LocalExpansion::EvaluateField(const Vector& x_q) const { return sum; } -template -void LocalExpansion::Init(const Vector& center, - const Matrix& basis_vectors, - const TKernelAux &ka) { - - // copy kernel type, center, and bandwidth squared - kernel_ = &(ka.kernel_); - center_.Copy(center); - order_ = -1; - sea_ = &(ka.sea_); - ka_ = &ka; - basis_vectors_.Alias(basis_vectors); - - // initialize coefficient array - coeffs_.Init(sea_->get_max_total_num_coeffs()); - coeffs_.SetZero(); -} - template void LocalExpansion::Init(const Vector& center, const TKernelAux &ka) { @@ -385,10 +355,6 @@ void LocalExpansion::Init(const Vector& center, order_ = -1; sea_ = &(ka.sea_); ka_ = &ka; - - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); @@ -405,10 +371,6 @@ void LocalExpansion::Init(const TKernelAux &ka) { center_.Init(sea_->get_dimension()); ka_ = &ka; - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); - // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); coeffs_.SetZero(); @@ -426,12 +388,6 @@ int LocalExpansion::OrderForEvaluating actual_error); } -template -void LocalExpansion::RotateFromLocal -(const LocalExpansion &se) { - -} - template void LocalExpansion::TranslateFromFarField (const FarFieldExpansion &se) { diff --git a/fastlib/u/dongryel/series_expansion/mult_farfield_expansion.h b/fastlib/u/dongryel/series_expansion/mult_farfield_expansion.h index 19f129bc6e..6380a92a49 100644 --- a/fastlib/u/dongryel/series_expansion/mult_farfield_expansion.h +++ b/fastlib/u/dongryel/series_expansion/mult_farfield_expansion.h @@ -24,9 +24,6 @@ class MultFarFieldExpansion { private: - /** the basis vectors */ - Matrix basis_vectors_; - /** The center of the expansion */ Vector center_; @@ -46,7 +43,6 @@ class MultFarFieldExpansion { const typename TKernelAux::TSeriesExpansionAux *sea_; OT_DEF(MultFarFieldExpansion) { - OT_MY_OBJECT(basis_vectors_); OT_MY_OBJECT(center_); OT_MY_OBJECT(coeffs_); OT_MY_OBJECT(order_); @@ -133,8 +129,6 @@ class MultFarFieldExpansion { */ void Init(const Vector& center, const TKernelAux &ka); void Init(const TKernelAux &ka); - void Init(const Vector& center, const Matrix& basis_vectors, - const TKernelAux &ka); /** * Computes the required order for evaluating the far field expansion @@ -167,12 +161,6 @@ class MultFarFieldExpansion { */ void PrintDebug(const char *name="", FILE *stream=stderr) const; - /** - * Rotate from another far field expansion so that its farfield moments - * expressed in terms of the basis vectors owned here. - */ - void RotateFromFarField(const MultFarFieldExpansion &se); - /** * Translate from a far field expansion to the expansion here. * The translated coefficients are added up to the ones here. @@ -421,24 +409,6 @@ double MultFarFieldExpansion::EvaluateField(const Vector& x_q, return multipole_sum; } -template -void MultFarFieldExpansion::Init(const Vector& center, - const Matrix& basis_vectors, - const TKernelAux &ka) { - - // copy kernel type, center, and bandwidth squared - kernel_ = &(ka.kernel_); - center_.Copy(center); - order_ = -1; - sea_ = &(ka.sea_); - ka_ = &ka; - basis_vectors_.Alias(basis_vectors); - - // initialize coefficient array - coeffs_.Init(sea_->get_max_total_num_coeffs()); - coeffs_.SetZero(); -} - template void MultFarFieldExpansion::Init(const Vector& center, const TKernelAux &ka) { @@ -450,10 +420,6 @@ template sea_ = &(ka.sea_); ka_ = &ka; - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); - // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); coeffs_.SetZero(); @@ -470,10 +436,6 @@ template center_.SetZero(); ka_ = &ka; - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); - // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); coeffs_.SetZero(); @@ -555,12 +517,6 @@ void MultFarFieldExpansion::PrintDebug fprintf(stream, "\n"); } -template -void MultFarFieldExpansion::RotateFromFarField -(const MultFarFieldExpansion &se) { - -} - template void MultFarFieldExpansion::TranslateFromFarField (const MultFarFieldExpansion &se) { diff --git a/fastlib/u/dongryel/series_expansion/mult_local_expansion.h b/fastlib/u/dongryel/series_expansion/mult_local_expansion.h index 2cb7500d33..52f96fef85 100644 --- a/fastlib/u/dongryel/series_expansion/mult_local_expansion.h +++ b/fastlib/u/dongryel/series_expansion/mult_local_expansion.h @@ -24,9 +24,6 @@ class MultLocalExpansion { private: - /** the basis vectors */ - Matrix basis_vectors_; - /** The center of the expansion */ Vector center_; @@ -46,7 +43,6 @@ class MultLocalExpansion { const typename TKernelAux::TSeriesExpansionAux *sea_; OT_DEF(MultLocalExpansion) { - OT_MY_OBJECT(basis_vectors_); OT_MY_OBJECT(center_); OT_MY_OBJECT(coeffs_); OT_MY_OBJECT(order_); @@ -103,8 +99,6 @@ class MultLocalExpansion { */ void Init(const Vector& center, const TKernelAux &sea); void Init(const TKernelAux &sea); - void Init(const Vector& center, const Matrix& basis_vectors, - const TKernelAux &sea); /** * Computes the required order for evaluating the local expansion @@ -121,12 +115,6 @@ class MultLocalExpansion { */ void PrintDebug(const char *name="", FILE *stream=stderr) const; - /** - * rotate from another local expansion such that its local moments - * expressed in terms of the basis vectors here. - */ - void RotateFromLocal(const MultLocalExpansion &se); - /** * Translate from a far field expansion to the expansion here. * The translated coefficients are added up to the ones here. @@ -385,24 +373,6 @@ double MultLocalExpansion::EvaluateField(const Vector& x_q) const { return sum; } -template -void MultLocalExpansion::Init(const Vector& center, - const Matrix& basis_vectors, - const TKernelAux &ka) { - - // copy kernel type, center, and bandwidth squared - kernel_ = &(ka.kernel_); - center_.Copy(center); - order_ = -1; - sea_ = &(ka.sea_); - ka_ = &ka; - basis_vectors_.Alias(basis_vectors); - - // initialize coefficient array - coeffs_.Init(sea_->get_max_total_num_coeffs()); - coeffs_.SetZero(); -} - template void MultLocalExpansion::Init(const Vector& center, const TKernelAux &ka) { @@ -414,10 +384,6 @@ void MultLocalExpansion::Init(const Vector& center, sea_ = &(ka.sea_); ka_ = &ka; - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); - // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); coeffs_.SetZero(); @@ -433,10 +399,6 @@ void MultLocalExpansion::Init(const TKernelAux &ka) { order_ = -1; ka_ = &ka; - // basis vectors are empty, if we assume that we are using the global - // coordinate system - basis_vectors_.Init(0, 0); - // initialize coefficient array coeffs_.Init(sea_->get_max_total_num_coeffs()); coeffs_.SetZero(); @@ -454,12 +416,6 @@ int MultLocalExpansion::OrderForEvaluating actual_error); } -template -void MultLocalExpansion::RotateFromLocal -(const MultLocalExpansion &se) { - -} - template void MultLocalExpansion::TranslateFromFarField (const MultFarFieldExpansion &se) {