Changeset 890 for trunk/src/SDFitter.cc

Timestamp:

03/08/06 13:32:27 (18 years ago)

Author:

mar637

Message:

asap2 naming changes

File:

• trunk/src/SDFitter.cc (modified) (19 diffs)

trunk/src/SDFitter.cc

@@ -1 +1 @@
 //#---------------------------------------------------------------------------
-//# SDFitter.cc: A Fitter class for spectra
+//# Fitter.cc: A Fitter class for spectra
 //#--------------------------------------------------------------------------
 //# Copyright (C) 2004
@@ -27 +27 @@
 //#                        AUSTRALIA
 //#
-//# $Id:
+//# $Id:$
 //#---------------------------------------------------------------------------
 #include <casa/aips.h>
@@ -47 +47 @@
 using namespace casa;
 
-SDFitter::SDFitter()
-{
-}
-
-SDFitter::~SDFitter()
+Fitter::Fitter()
+{
+}
+
+Fitter::~Fitter()
 {
   reset();
 }
 
-void SDFitter::clear()
+void Fitter::clear()
 {
   for (uInt i=0;i< funcs_.nelements();++i) {
@@ -69 +69 @@
 }
 
-void SDFitter::reset()
+void Fitter::reset()
 {
   clear();
@@ -78 +78 @@
 
 
-bool SDFitter::computeEstimate() {
+bool Fitter::computeEstimate() {
   if (x_.nelements() == 0 || y_.nelements() == 0)
     throw (AipsError("No x/y data specified."));
@@ -122 +122 @@
 }
 
-std::vector<float> SDFitter::getEstimate() const
+std::vector<float> Fitter::getEstimate() const
 {
   if (estimate_.nelements() == 0)
@@ -132 +132 @@
 
 
-bool SDFitter::setExpression(const std::string& expr, int ncomp)
+bool Fitter::setExpression(const std::string& expr, int ncomp)
 {
   clear();
@@ -154 +154 @@
 }
 
-bool SDFitter::setData(std::vector<float> absc, std::vector<float> spec,
+bool Fitter::setData(std::vector<float> absc, std::vector<float> spec,
                        std::vector<bool> mask)
 {
@@ -171 +171 @@
 }
 
-std::vector<float> SDFitter::getResidual() const
+std::vector<float> Fitter::getResidual() const
 {
     if (residual_.nelements() == 0)
@@ -180 +180 @@
 }
 
-std::vector<float> SDFitter::getFit() const
+std::vector<float> Fitter::getFit() const
 {
     Vector<Float> out = thefit_;
@@ -189 +189 @@
 }
 
-std::vector<float> SDFitter::getErrors() const
+std::vector<float> Fitter::getErrors() const
 {
     Vector<Float> out = error_;
@@ -197 +197 @@
 }
 
-bool SDFitter::setParameters(std::vector<float> params)
+bool Fitter::setParameters(std::vector<float> params)
 {
     Vector<Float> tmppar(params);
@@ -226 +226 @@
 }
 
-bool SDFitter::setFixedParameters(std::vector<bool> fixed)
+bool Fitter::setFixedParameters(std::vector<bool> fixed)
 {
     Vector<Bool> tmp(fixed);
@@ -252 +252 @@
 }
 
-std::vector<float> SDFitter::getParameters() const {
+std::vector<float> Fitter::getParameters() const {
     Vector<Float> out = parameters_;
     std::vector<float> stlout;
@@ -259 +259 @@
 }
 
-std::vector<bool> SDFitter::getFixedParameters() const {
+std::vector<bool> Fitter::getFixedParameters() const {
   Vector<Bool> out(parameters_.nelements());
   if (fixedpar_.nelements() == 0) {
@@ -272 +272 @@
 }
 
-float SDFitter::getChisquared() const {
+float Fitter::getChisquared() const {
     return chisquared_;
 }
 
-bool SDFitter::fit() {
+bool Fitter::fit() {
   NonLinearFitLM<Float> fitter;
   CompoundFunction<Float> func;
@@ -293 +293 @@
   Vector<Float> sigma(x_.nelements());
   sigma = 1.0;
-  
+
   parameters_.resize();
   parameters_ = fitter.fit(x_, y_, sigma, &m_);
@@ -304 +304 @@
 
   chisquared_ = fitter.getChi2();
-  
+
   residual_.resize();
   residual_ =  y_;
@@ -316 +316 @@
 
 
-std::vector<float> SDFitter::evaluate(int whichComp) const
-{  
+std::vector<float> Fitter::evaluate(int whichComp) const
+{
   std::vector<float> stlout;
-  uInt idx = uInt(whichComp); 
+  uInt idx = uInt(whichComp);
   Float y;
   if ( idx < funcs_.nelements() ) {