Changeset 1924 for branches/polybatch/src/STFitEntry.cpp

Timestamp:

09/14/10 12:17:16 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #206: use STFitEntry as return objetc instead of pointer wrnagling.

File:

• branches/polybatch/src/STFitEntry.cpp (modified) (2 diffs)

branches/polybatch/src/STFitEntry.cpp

@@ -11 +11 @@
 //
 #include "STFitEntry.h"
+#include <casa/iostream.h>
 
+using namespace casa;
 namespace asap {
 
-STFitEntry::STFitEntry()
+  STFitEntry::STFitEntry()
+  /* : 
+    functions_( std::vector<std::string>()),
+    components_(std::vector<int>()),
+    parameters_(std::vector<float>()),
+    errors_(std::vector<float>()),
+    parmasks_(std::vector<bool>()),
+    frameinfo_(std::vector<std::string>())
+  */
 {
 }
@@ -20 +30 @@
 {
   if ( this != &other ) {
-    this->functions_ = other.functions_;
+    this->functions_ = std::vector<std::string>();
     this->components_ = other.components_;
     this->parameters_ = other.parameters_;
-    this->parmasks_ = other.parmasks_;
+    this->errors_ = other.errors_;
     this->frameinfo_ = other.frameinfo_;
   }
 }
 
+STFitEntry& STFitEntry::operator=(const STFitEntry& other)
+{
+  if ( this != &other ) {
+    this->functions_ = other.functions_;
+    this->components_ = other.components_;
+    this->parameters_ = other.parameters_;
+    this->errors_ = other.errors_;
+    this->parmasks_ = other.parmasks_;
+    this->frameinfo_ = other.frameinfo_;
+  }
+  return *this;
+}
 
 STFitEntry::~STFitEntry()