Changeset 1535

Timestamp:

Sep 25, 2008, 9:01:48 PM (15 years ago)

Author:

Peter

Message:

fixing DataWeightProxy?

Location:

trunk

Files:

• test/data_weight_proxy_test.cc (modified) (2 diffs)
• yat/utility/DataWeightProxy.cc (modified) (1 diff)
• yat/utility/DataWeightProxy.h (modified) (2 diffs)

trunk/test/data_weight_proxy_test.cc

@@ -25 +25 @@
 #include "yat/utility/DataWeightProxy.h"
 
+namespace theplu {
+namespace yat {
+namespace test {
+  class ProxyHolder
+  {
+  public:
+    ProxyHolder(utility::DataWeightProxy& proxy)
+      : proxy_(proxy) {}
+
+    inline utility::DataWeightProxy& operator()(void) { return proxy_; }
+    inline const utility::DataWeightProxy& operator()(void) const 
+    { return proxy_; }
+  private:
+    utility::DataWeightProxy& proxy_;
+  };
+}}}
+
 using namespace theplu::yat;
 
@@ -33 +50 @@
 
   using utility::DataWeightProxy;
+  using utility::DataWeight;
 
   double x=1.2;
-  double y=3.14;
-  DataWeightProxy proxy(x,y);
+  double w=3.14;
+  DataWeight xw(x, w);
+  DataWeightProxy proxy(x,w);
+  if (xw != proxy) {
+    suite.add(false);
+  }
+  if (proxy != xw) {
+    suite.add(false);
+  }
 
-  suite.return_value();
+  suite.err() << "testing conversion to DataWeight\n";
+  test::ProxyHolder holder(proxy);
+  const test::ProxyHolder const_holder(proxy);
+  
+  xw = holder();
+  xw = const_holder();
+
+  if (holder() != holder()) {
+    suite.add(false);
+  }
+  if (holder() != const_holder()) {
+    suite.add(false);
+  }
+
+  suite.err() << "testing assignment\n";
+  holder().data() = 1.0;
+  suite.add(suite.equal(holder().data(), 1.0));
+  holder().weight() = 1.0;
+  suite.add(suite.equal(holder().weight(), 1.0));
+
+  DataWeight xw2(3.14, 0.5);
+  holder() = xw2;
+  suite.add(suite.equal(holder().data(), 3.14));
+  suite.add(suite.equal(holder().weight(), 0.5));
+
+  DataWeight xw3;
+  xw3 = const_holder();
+  suite.add(suite.equal(xw3.data(), 3.14));
+  suite.add(suite.equal(xw3.weight(), 0.5));
+
+  return suite.return_value();
 }

trunk/yat/utility/DataWeightProxy.cc

@@ -52 +52 @@
   }
 
+
+  DataWeightProxy& DataWeightProxy::operator=(const DataWeight& rhs)
+  {
+    data() = rhs.data();
+    weight() = rhs.weight();
+    return *this;
+  }
+
+
+  DataWeightProxy::operator DataWeight() const
+  {
+    return DataWeight(data(), weight());
+  }
+
+
 }}} // of namespace utility, yat, and theplu

trunk/yat/utility/DataWeightProxy.h

@@ -22 +22 @@
   along with yat. If not, see <http://www.gnu.org/licenses/>.
 */
+
+#include "DataWeight.h"
 
 namespace theplu {
@@ -62 +64 @@
      */
     const double& weight(void) const;
+
+    /**
+       \brief assignment operator
+     */
+    DataWeightProxy& operator=(const DataWeight& rhs);
+
+    /**
+       \brief Conversion to DataWeight
+     */
+    operator DataWeight() const;
+
   private:
     double& data_;