Merge pull request #183 from icsm-au/1.2.6

Version 1.2.6 (Code enhancements)

Author: rogerfraser

.gitignore

@@ -24,5 +24,8 @@ dynadjust/bin/
 /.idea/
 .vscode/*
 
+# Visual Studio 2015/2017 cache/options directory
+.vs/
+
 # readme and other files not requiring external contribution
 README.md

dynadjust/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.15)
 
 project (dynadjust)
 
-set (DYNADJUST_VERSION "1.2.5")
+set (DYNADJUST_VERSION "1.2.6")
 
 if (BUILD_TESTING)
     enable_testing()
@@ -106,30 +106,40 @@ else()
 endif()
 
 if( NOT IOMP5_LIB )
-   set(DNA_BUILD_ERROR 1)
-   set (IOMP5_FIND_ERROR 1)
-   message(SEND_ERROR "Cannot find iomp5 library")
+    set(DNA_BUILD_ERROR 1)
+    set (IOMP5_FIND_ERROR 1)
+    message(SEND_ERROR "Cannot find iomp5 library")
 endif()
 
 if( NOT MKL_INTEL_ILP64 )
-   set(DNA_BUILD_ERROR 1)
-   set (MKL_INTEL_ILP64_FIND_ERROR 1)
-   message(SEND_ERROR "Cannot find mkl_intel_ilp64 library")
+    set(DNA_BUILD_ERROR 1)
+    set (MKL_INTEL_ILP64_FIND_ERROR 1)
+    message(SEND_ERROR "Cannot find mkl_intel_ilp64 library")
 endif()
 
 if( NOT MKL_INTEL_THREAD )
-   set(DNA_BUILD_ERROR 1)
-   set (MKL_INTEL_THREAD_FIND_ERROR 1)
-   message(SEND_ERROR "Cannot find mkl_intel_thread library")
+    set(DNA_BUILD_ERROR 1)
+    set (MKL_INTEL_THREAD_FIND_ERROR 1)
+    message(SEND_ERROR "Cannot find mkl_intel_thread library")
 endif()
 
 if( NOT MKL_INTEL_CORE )
-   set(DNA_BUILD_ERROR 1)
-   set (MKL_INTEL_CORE_FIND_ERROR 1)
-   message(SEND_ERROR "Cannot find mkl_intel_core library")
+    set(DNA_BUILD_ERROR 1)
+    set (MKL_INTEL_CORE_FIND_ERROR 1)
+    message(SEND_ERROR "Cannot find mkl_intel_core library")
 endif()
 
-set (DNA_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARY} ${MKL_INTEL_ILP64} ${MKL_INTEL_THREAD} ${MKL_INTEL_CORE} ${IOMP5_LIB})
+find_package(OpenMP)
+
+if (OpenMP_CXX_FOUND)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
+else()
+    set(DNA_BUILD_ERROR 1)
+    set (OPENMP_CORE_FIND_ERROR 1)
+    message(SEND_ERROR "Cannot find openmp library")
+endif()
+
+set (DNA_LIBRARIES ${Boost_LIBRARIES} ${XERCESC_LIBRARY} ${MKL_INTEL_ILP64} ${MKL_INTEL_THREAD} ${MKL_INTEL_CORE} ${IOMP5_LIB} OpenMP::OpenMP_CXX)
 
 message (STATUS "DynAdjust library dependencies:")
 message (STATUS ${DNA_LIBRARIES})

dynadjust/dynadjust.rc

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,2,5,0
- PRODUCTVERSION 1,2,5,0
+ FILEVERSION 1,2,6,0
+ PRODUCTVERSION 1,2,6,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -42,12 +42,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "DynAdjust is a rigorous, high performance least squares adjustment application."
-            VALUE "FileVersion", "1.2.5.0"
+            VALUE "FileVersion", "1.2.6.0"
             VALUE "InternalName", "DynAdjust"
             VALUE "LegalCopyright", "Copyright 2022 Geoscience Australia"
             VALUE "OriginalFilename", "DynAdjust"
             VALUE "ProductName", "DynAdjust"
-            VALUE "ProductVersion", "1.2.5.0"
+            VALUE "ProductVersion", "1.2.6.0"
         END
     END
     BLOCK "VarFileInfo"

dynadjust/dynadjust/dnaadjustwrapper/dnaadjustwrapper.cpp

@@ -27,6 +27,7 @@ extern bool running;
 extern boost::mutex cout_mutex;
 
 using namespace dynadjust;
+using namespace dynadjust::epsg;
 
 void PrintSummaryMessage(dna_adjust* netAdjust, const project_settings* p, milliseconds *elapsed_time)
 {
@@ -470,14 +471,25 @@ int ParseCommandLineOptions(const int& argc, char* argv[], const variables_map&
 			// do nothing
 		}
 
-		// update geoid file name from dnaproj file (blank if geoid was not run)
+		// update geoid file name from dnaproj file (blank if geoid was not executed)
 		try {
 			CDnaProjectFile projectFile(p.g.project_file, geoidSetting);
 			p.n = projectFile.GetSettings().n;
 		}
 		catch (...) {
 			// do nothing
-		}		
+		}
+
+		// update reftran settings from dnaproj file
+		// Note, if reftran was not executed, reference frame and epoch will be set to 
+		// the frame and epoch captured on import.
+		try {
+			CDnaProjectFile projectFile(p.g.project_file, reftranSetting);
+			p.r = projectFile.GetSettings().r;
+		}
+		catch (...) {
+			// do nothing
+		}
 	}
 
 	// binary station file location (output)
@@ -1042,8 +1054,8 @@ int main(int argc, char* argv[])
 	bool bst_meta_import, bms_meta_import;
 	LoadBinaryMeta(bst_meta, bms_meta, p, bst_meta_import, bms_meta_import);
 
-	// Capture datum set within binary files
-	CDnaDatum datum(bst_meta.epsgCode, bst_meta.epoch);
+	// Capture datum set within project file
+	CDnaDatum datum(epsgStringFromName<string>(p.r.reference_frame), p.r.epoch);
 
 	if (vm.count(QUIET))
 		p.g.quiet = 1;

dynadjust/dynadjust/dnaimport/dnainterop.cpp

@@ -36,6 +36,10 @@ MsrTally	g_parsemsr_tally;
 StnTally	g_parsestn_tally;
 UINT32		g_fileOrder;
 
+//boost::random::mt19937 rng;
+//boost::random::uniform_real_distribution<double> stdev(0.0, 3.0);
+//boost::random::uniform_real_distribution<double> pertu(0.0, 1.0);
+
 //int compare_chararray(const void *a, const void *b)
 //{
 //	const char* a1 = *(const char**)a;
@@ -650,7 +654,7 @@ void dna_import::ParseXML(const string& fileName, vdnaStnPtr* vStations, PUINT32
 			return;
 		}
 		stringstream ss;
-		ss << "ParseInputFile(): An ios_base failure was encountered while parsing " << fileName << "." << endl << "  " << f.what();
+		ss << "ParseXML(): An ios_base failure was encountered while parsing " << fileName << "." << endl << "  " << f.what();
 		SignalExceptionParse(static_cast<string>(ss.str()), 0);
 	}
 	catch (const std::system_error& e)
@@ -668,13 +672,13 @@ void dna_import::ParseXML(const string& fileName, vdnaStnPtr* vStations, PUINT32
 			return;
 		}
 		stringstream ss;
-		ss << "ParseInputFile(): An ios_base failure was encountered while parsing " << fileName << "." << endl << "  " << e.what();
+		ss << "ParseXML(): An ios_base failure was encountered while parsing " << fileName << "." << endl << "  " << e.what();
 		SignalExceptionParse(static_cast<string>(ss.str()), 0);
 	}
 	catch (const XMLInteropException& e) 
 	{
 		stringstream ss;
-		ss << "ParseInputFile(): An exception was encountered while parsing " << fileName << "." << endl << "  " << e.what();
+		ss << "ParseXML(): An exception was encountered while parsing " << fileName << "." << endl << "  " << e.what();
 		SignalExceptionParse(static_cast<string>(ss.str()), 0);
 	}
 	catch (const ::xml_schema::parsing& e)
@@ -696,13 +700,13 @@ void dna_import::ParseXML(const string& fileName, vdnaStnPtr* vStations, PUINT32
 	catch (const ::xml_schema::exception& e)
 	{
 		stringstream ss;
-		ss << "ParseInputFile(): An xml_schema exception was encountered while parsing " << fileName << "." << endl << "  " << e.what();
+		ss << "ParseXML(): An xml_schema exception was encountered while parsing " << fileName << "." << endl << "  " << e.what();
 		SignalExceptionParse(static_cast<string>(ss.str()), 0);
 	}
 	catch (...)
 	{
 		stringstream ss;
-		ss << "ParseInputFile(): An unknown error was encountered while parsing " << fileName << "." << endl;
+		ss << "ParseXML(): An unknown error was encountered while parsing " << fileName << "." << endl;
 		SignalExceptionParse(ss.str(), 0);	
 	}
 
@@ -1204,6 +1208,7 @@ void dna_import::ParseDNA(const string& fileName, vdnaStnPtr* vStations, PUINT32
 		import_file_mutex.unlock();
 	}
 	catch (const runtime_error& e) {
+		import_file_mutex.unlock();
 		throw XMLInteropException(e.what(), 0);
 	}
 
@@ -1231,12 +1236,14 @@ void dna_import::ParseDNA(const string& fileName, vdnaStnPtr* vStations, PUINT32
 			ss << "ParseDNA(): An ios_base failure was encountered when attempting to read stations file  " << fileName << "." << endl << "  " << f.what();
 			throw XMLInteropException(ss.str(), 0);
 		}
-		catch (const XMLInteropException& f) {
+		catch (const XMLInteropException& f)
+		{
 			stringstream ss;
+			ss << "ParseInputFile(): An exception was encountered while parsing " << fileName << "." << endl;
 			ss << "  - line " << m_lineNo;
-			ss << ", column " <<  m_columnNo << endl;
+			ss << ", column " << m_columnNo << endl;
 			ss << "  - " << f.what();
-			throw XMLInteropException(ss.str(), 0);
+			SignalExceptionParse(static_cast<string>(ss.str()), 0);
 		}
 		catch (...) {
 			if (ifsInputFILE_->eof())
@@ -1273,12 +1280,14 @@ void dna_import::ParseDNA(const string& fileName, vdnaStnPtr* vStations, PUINT32
 			ss << "ParseDNA(): An ios_base failure was encountered when attempting to read measurements file  " << fileName << "." << endl << "  " << f.what();
 			throw XMLInteropException(ss.str(), 0);
 		}
-		catch (const XMLInteropException& f) {
+		catch (const XMLInteropException& f)
+		{
 			stringstream ss;
-			ss << endl << "  - line " << m_lineNo;
-			ss << ", column " <<  m_columnNo << endl;
+			ss << "ParseInputFile(): An exception was encountered while parsing " << fileName << "." << endl;
+			ss << "  - line " << m_lineNo;
+			ss << ", column " << m_columnNo << endl;
 			ss << "  - " << f.what();
-			throw XMLInteropException(ss.str(), 0);
+			SignalExceptionParse(static_cast<string>(ss.str()), 0);
 		}
 		catch (...) {
 			if (ifsInputFILE_->eof())
@@ -2858,7 +2867,7 @@ void dna_import::ParseDNAMSRDirections(string& sBuf, dnaMsrPtr& msr_ptr, bool ig
 		msr_ptr->SetTarget(ParseTargetValue(sBuf, "ParseDNAMSRDirections"));
 
 	// Number of directions
-	UINT32 dirnCount;
+	UINT32 dirnCount, dirnCountLessIgnored;
 	msr_ptr->SetTotal(ParseMsrCountValue(sBuf, dirnCount, "ParseDNAMSRDirections"));
 	msr_ptr->GetDirections_ptr()->reserve(dirnCount);
 
@@ -2889,19 +2898,37 @@ void dna_import::ParseDNAMSRDirections(string& sBuf, dnaMsrPtr& msr_ptr, bool ig
 		dirnTmp.SetClusterID(msr_ptr->GetClusterID());
 	}
 
+	bool subignoreMsr;
+	dirnCountLessIgnored = dirnCount;
+
+	if (dirnCount == 0)
+		throw XMLInteropException("Zero direction count.", m_lineNo);
+
 	for (UINT32 dirn=0; dirn<dirnCount; ++dirn)
 	{
-		dirnTmp.SetFirst(msr_ptr->GetFirst());
-		dirnTmp.SetIgnore(ignoreMsr);
-		g_parsemsr_tally.D++;
-
 		m_lineNo++;
 		// Obtain exclusive use of the input file pointer
 		import_file_mutex.lock();
 		getline((*ifsInputFILE_), sBuf);
 		// release file pointer mutex
 		import_file_mutex.unlock();
 
+		// get ignore flag for sub direction and remove accordingly
+		subignoreMsr = iequals("*", sBuf.substr(dml_.msr_ignore, dmw_.msr_ignore));
+
+		if (subignoreMsr)
+		{
+			dirnCountLessIgnored--;
+			if (dirnCountLessIgnored == 0)
+				throw XMLInteropException("There aren't any non-ignored directions in the set.", m_lineNo);
+			msr_ptr->SetTotal(dirnCountLessIgnored);
+			continue;
+		}
+
+		dirnTmp.SetFirst(msr_ptr->GetFirst());
+		dirnTmp.SetIgnore(ignoreMsr);
+		g_parsemsr_tally.D++;
+
 		// Second target station
 		dirnTmp.SetTarget(ParseTarget2Value(sBuf, "ParseDNAMSRDirections"));
 
@@ -5585,7 +5612,7 @@ void dna_import::MapMeasurementStations(vdnaMsrPtr* vMeasurements, pvASLPtr vAss
 		if (_it_msr->get()->GetIgnore())
 			vIgnoredMsrs->push_back(static_cast<UINT32>(std::distance(vMeasurements->begin(), _it_msr)));
 
-		// 1. Handle nested type measurements (D, G, X, Y) separately
+		// 1. Handle nested type measurements (G, X, Y) separately
 		switch (_it_msr->get()->GetTypeC())
 		{
 		case 'G':	// GPS Baseline (treat as single-baseline cluster)