Changeset 2666 for trunk/src

Timestamp:

10/15/12 15:52:38 (12 years ago)

Author:

Malte Marquarding

Message:

Ticket #173: added setting of constraints on the fitter.

Location:

trunk/src

Files:

• STFitter.cpp (modified) (6 diffs)
• STFitter.h (modified) (4 diffs)
• STLineFinder.h (modified) (1 diff)
• Scantable.cpp (modified) (1 diff)
• Scantable.h (modified) (2 diffs)
• python_Fitter.cpp (modified) (1 diff)
• python_asap.cpp (modified) (1 diff)

trunk/src/STFitter.cpp

@@ -80 +80 @@
   y_.resize();
   m_.resize();
+  constraints_.clear();
 }
 
@@ -294 +295 @@
 }
 
+void Fitter::addConstraint(const std::vector<float>& constraint)
+{
+  if (funcs_.nelements() == 0)
+    throw (AipsError("Function not yet set."));
+  constraints_.push_back(constraint);
+  
+}
+
+void Fitter::applyConstraints(GenericL2Fit<Float>& fitter)
+{
+  std::vector<std::vector<float> >::const_iterator it;
+  for (it = constraints_.begin(); it != constraints_.end(); ++it) {
+    Vector<Float> tmp(*it);
+    fitter.addConstraint(tmp(Slice(0,tmp.nelements()-1)),
+                         tmp(tmp.nelements()-1));
+  }
+}
+
 bool Fitter::setFixedParameters(std::vector<bool> fixed)
 {
@@ -377 +396 @@
   // Convergence criterium
   fitter.setCriteria(0.001);
+  applyConstraints(fitter);
 
   // Fit
@@ -397 +417 @@
   chisquared_ = fitter.getChi2();
 
-//   residual_.resize();
-//   residual_ =  y_;
-//   fitter.residual(residual_,x_);
   // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
   fitter.residual(thefit_,x_,True);
-  // residual = data - model
   residual_.resize(x_.nelements()); 
   residual_ = y_ - thefit_ ;
@@ -419 +435 @@
 
   fitter.setFunction(func);
-  //fitter.setMaxIter(50+n*10);
-  // Convergence criterium
-  //fitter.setCriteria(0.001);
-
-  // Fit
-//   Vector<Float> sigma(x_.nelements());
-//   sigma = 1.0;
+  applyConstraints(fitter);
 
   parameters_.resize();
-//   parameters_ = fitter.fit(x_, y_, sigma, &m_);
   parameters_ = fitter.fit(x_, y_, &m_);
   std::vector<float> ps;
@@ -439 +448 @@
   chisquared_ = fitter.getChi2();
 
-//   residual_.resize();
-//   residual_ =  y_;
-//   fitter.residual(residual_,x_);
-  // use fitter.residual(model=True) to get the model
   thefit_.resize(x_.nelements());
   fitter.residual(thefit_,x_,True);
-  // residual = data - model
   residual_.resize(x_.nelements()); 
   residual_ = y_ - thefit_ ;

trunk/src/STFitter.h

@@ -39 +39 @@
 #include <scimath/Functionals/Function.h>
 #include <scimath/Functionals/CompoundFunction.h>
+#include <scimath/Fitting/GenericL2Fit.h>
+
 
 #include "STFitEntry.h"
+
 
 namespace asap {
@@ -55 +58 @@
   bool setParameters(std::vector<float> params);
   bool setFixedParameters(std::vector<bool> fixed);
+  void addConstraint(const std::vector<float>& constraint);
 
   std::vector<float> getResidual() const;
@@ -76 +80 @@
 private:
   void clear();
+  void applyConstraints(casa::GenericL2Fit<casa::Float>& fitter);
   casa::Vector<casa::Float> x_;
   casa::Vector<casa::Float> y_;
@@ -87 +92 @@
   casa::Vector<casa::Float> parameters_;
   casa::Vector<casa::Bool> fixedpar_;
+  std::vector<std::vector<float> > constraints_;
 
   casa::Vector<casa::Float> error_;

trunk/src/STLineFinder.h

@@ -48 +48 @@
 #include "ScantableWrapper.h"
 #include "Scantable.h"
-#include "STFitter.h"
 
 namespace asap {

trunk/src/Scantable.cpp

@@ -71 +71 @@
 #include "STPolStokes.h"
 #include "STUpgrade.h"
+#include "STFitter.h"
 #include "Scantable.h"
 

trunk/src/Scantable.h

@@ -43 +43 @@
 #include "STFit.h"
 #include "STFitEntry.h"
-#include "STFitter.h"
+//#include "STFitter.h"
 #include "STFocus.h"
 #include "STFrequencies.h"
@@ -55 +55 @@
 
 namespace asap {
+
+class Fitter;
 
 /**

trunk/src/python_Fitter.cpp

@@ -49 +49 @@
         .def("getparameters", &Fitter::getParameters)
         .def("setparameters", &Fitter::setParameters)
+        .def("addconstraint", &Fitter::addConstraint)
         .def("getestimate", &Fitter::getEstimate)
         .def("estimate", &Fitter::computeEstimate)

trunk/src/python_asap.cpp

@@ -124 +124 @@
   casa::pyrap::register_convert_casa_valueholder();
   casa::pyrap::register_convert_casa_record();
+
 #endif
 }