Changeset 2666 for trunk/src/STFitter.h

Timestamp:

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

Author:

Malte Marquarding

Message:

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

File:

• trunk/src/STFitter.h (modified) (4 diffs)

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_;