Ginan v1.1.1-alpha release

GeoscienceAustralia · Sep 29, 2021 · 510800b · 510800b
1 parent 598cfff
commit 510800b
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,26 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+
+## [Unreleased]
+
+## [1.1.1] - 2021-09-29
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+- Eigen v3.4 compilation problem fix
+### Security
+
+## [1.1.0] - 2021-??-??
+### Added
+### Changed
+### Deprecated
+### Removed
+### Fixed
+### Security
+
+## [1.0.0] - 2021-07-13
+### First Release
diff --git a/src/cpp/common/algebra.cpp b/src/cpp/common/algebra.cpp
@@ -773,7 +773,7 @@ bool KFState::chiQC(
 	VectorXd&	xp)         ///< Post filtered state vector
 {
 	auto& H = kfMeas.A;
-	auto W = kfMeas.W(Eigen::all, 0);
+	auto W = kfMeas.W(all, 0);
 
 	VectorXd&	y		= kfMeas.Y;
 	VectorXd	v		= y - H * xp;
@@ -1064,7 +1064,7 @@ void KFState::leastSquareInitStates(
 	}
 
 	//get the subset of the measurement matrix that applies to the uninitialised states
-	auto subsetA = kfMeas.A(Eigen::all, newStateIndicies);
+	auto subsetA = kfMeas.A(all, newStateIndicies);
 
 	//find the subset of measurements that are required for the initialisation
 	auto usedMeas = subsetA.rowwise().any();
@@ -1109,7 +1109,7 @@ void KFState::leastSquareInitStates(
 	//copy in the required measurements from the old set
 	leastSquareMeas.Y.head		(measCount) = kfMeas.Y(leastSquareMeasIndicies);
 	leastSquareMeas.R.head		(measCount) = kfMeas.R(leastSquareMeasIndicies);
-	leastSquareMeas.A.topRows	(measCount) = kfMeas.A(leastSquareMeasIndicies, Eigen::all);
+	leastSquareMeas.A.topRows	(measCount) = kfMeas.A(leastSquareMeasIndicies, all);
 
 	//append any new pseudo measurements to the end
 	for (auto& [state, boool] : pseudoMeasStates)
@@ -1135,7 +1135,7 @@ void KFState::leastSquareInitStates(
 	KFMeas	leastSquareMeasSubs;
 	leastSquareMeasSubs.Y = leastSquareMeas.Y;
 	leastSquareMeasSubs.R = leastSquareMeas.R;
-	leastSquareMeasSubs.A = leastSquareMeas.A(Eigen::all, usedCols);
+	leastSquareMeasSubs.A = leastSquareMeas.A(all, usedCols);
 
 	//invert measurement noise matrix to get a weight matrix
 	leastSquareMeasSubs.W = (1 / leastSquareMeasSubs.R.array()).matrix();

diff --git a/src/cpp/common/algebra.hpp b/src/cpp/common/algebra.hpp
@@ -147,10 +147,10 @@ struct KFMeas
 
 		obsKeys.erase(obsKeys.begin() + index);
 
-		Y = ( Y(keepIndices)             ).eval();
-		V = ( V(keepIndices)             ).eval();
-		R = ( R(keepIndices)             ).eval();
-		A = ( A(keepIndices, Eigen::all) ).eval();
+		Y = ( Y(keepIndices)            ).eval();
+		V = ( V(keepIndices)            ).eval();
+		R = ( R(keepIndices)            ).eval();
+		A = ( A(keepIndices, all)       ).eval();
 	}
 };
 

diff --git a/src/cpp/common/eigenIncluder.hpp b/src/cpp/common/eigenIncluder.hpp
@@ -31,6 +31,7 @@ using Eigen::Map;
 using Eigen::Quaterniond;
 using Eigen::Triplet;
 using Eigen::ArrayXd;
+using Eigen::placeholders::all;
 typedef Eigen::Array<bool,Eigen::Dynamic,1> ArrayXb;
 
 template <typename Type, int Size>