Changeset 213 in pacpusframework for trunk/include

Timestamp:

11/06/13 14:44:39 (11 years ago)

Author:

Marek Kurdej

Message:

Update: Geodesie.

File:

• trunk/include/Pacpus/PacpusTools/geodesie.h (modified) (4 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);