Changeset 213 in pacpusframework

Timestamp:

Nov 6, 2013, 2:44:39 PM (11 years ago)

Author:

Marek Kurdej

Message:

Update: Geodesie.

Location:

trunk

Files:

• include/Pacpus/PacpusTools/geodesie.h (modified) (4 diffs)
• src/PacpusTools/src/geodesie.cpp (modified) (3 diffs)

trunk/include/Pacpus/PacpusTools/geodesie.h

@@ -21 +21 @@
 
 #include <boost/math/constants/constants.hpp>
+#include <boost/operators.hpp>
 #include <cmath>
 #include <iostream>
@@ -36 +37 @@
 /// @todo Rewrite!
 struct PACPUSTOOLS_API Matrice
+    : boost::multipliable<Matrice>
 {
     /// Copy ctor
@@ -41 +43 @@
     /// Ctor
     Matrice();
+    /// Ctor
+    Matrice(
+        double l0c0, double l0c1, double l0c2,
+        double l1c0, double l1c1, double l1c2,
+        double l2c0, double l2c1, double l2c2
+    );
+
     /// @todo Documentation
     void Apply(double v0, double v1, double v2, double& Mv0, double& Mv1, double& Mv2);
+
+    Matrice& operator*=(Matrice const& other);
 
     /// @todo Documentation
@@ -67 +78 @@
 
 PACPUSTOOLS_API Matrice TransMat(Matrice const& A);
-PACPUSTOOLS_API Matrice ProdMat(Matrice const& A, Matrice const& B);
+PACPUSTOOLS_API PACPUS_DEPRECATED_MSG(Matrice ProdMat(Matrice const& A, Matrice const& B), "use Matrice::operator *");
 PACPUSTOOLS_API PACPUS_DEPRECATED_MSG(void Write(Matrice const& A, std::ostream& out), "use operator<<");
 PACPUSTOOLS_API std::ostream& operator<<(std::ostream& os, Matrice const& A);

trunk/src/PacpusTools/src/geodesie.cpp

@@ -65 +65 @@
     Mv1 = c0_l1 * v0 + c1_l1 * v1 + c2_l1 * v2;
     Mv2 = c0_l2 * v0 + c1_l2 * v1 + c2_l2 * v2;
+}
+
+Matrice& Matrice::operator*=(Matrice const& other)
+{
+    // TODO: optimize
+    *this = ProdMat(*this, other);
+    return *this;
 }
 
@@ -301 +308 @@
     passage.c2_l2 = 1.0;
 
-    out = ProdMat(passage, in);
+    out = passage * in;
     double diff_h;
     raf98.Interpol(Rad2Deg(lambda), Rad2Deg(phi), &diff_h);
@@ -369 +376 @@
     passage.c2_l2 = 1.0;
 
-    out = ProdMat(passage, in);
+    out = passage * in;
 
     double diff_h;