Skip to content

Commit b1b39c8

Browse files
rogerfraserrogerfraser
authored
Merge pull request #181 from icsm-au/1.2.5
Version 1.2.5 (Code enhancements)
2 parents 1971536 + 2af5e51 commit b1b39c8

File tree

122 files changed

+6316
-5957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+6316
-5957
lines changed

‎dynadjust/CMakeLists.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.15)
22

33
project (dynadjust)
44

5-
set (DYNADJUST_VERSION "1.2.4")
5+
set (DYNADJUST_VERSION "1.2.5")
66

77
if (BUILD_TESTING)
88
enable_testing()
@@ -27,15 +27,15 @@ endif(UNIX)
2727
set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR};${CMAKE_MODULE_PATH}")
2828
set (CMAKE_CXX_STANDARD 14)
2929

30-
# Do not warn about uses of functions, variables, and types
31-
# marked as deprecated by using the deprecated attribute.
32-
add_definitions(-Wno-deprecated-declarations)
30+
# ignore warnings if the return type of a function has a
31+
# type qualifier such as const (e.g. std::exception::what())
32+
add_definitions(-Wno-ignored-qualifiers)
3333

3434
# default CXX flags
3535
if (BUILD_TESTING)
3636
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") # turn off warnings for unit testing and code coverage
3737
else ()
38-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
38+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
3939
endif (BUILD_TESTING)
4040

4141
# Debug CXX flags (GCC 4.8 introduced -Og for superior debugging experience. For older versions, use -O0)

‎dynadjust/dynadjust.props‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ImportGroup Label="PropertySheets" />
4+
<PropertyGroup Label="UserMacros">
5+
<BoostIncludeDir>C:\Data\boost\boost_1_78_0\include</BoostIncludeDir>
6+
<BoostLibDir>C:\Data\boost\boost_1_78_0\lib\$(Platform)</BoostLibDir>
7+
<XsdIncludeDir>C:\Program Files (x86)\CodeSynthesis XSD 4.0\include</XsdIncludeDir>
8+
<XsdLibDir_x64>C:\Program Files (x86)\CodeSynthesis XSD 4.0\lib64\vc-12.0</XsdLibDir_x64>
9+
<XsdLibDir_Win32>C:\Program Files (x86)\CodeSynthesis XSD 4.0\lib\vc-12.0</XsdLibDir_Win32>
10+
</PropertyGroup>
11+
<PropertyGroup />
12+
<ItemDefinitionGroup />
13+
<ItemGroup>
14+
<BuildMacro Include="BoostIncludeDir">
15+
<Value>$(BoostIncludeDir)</Value>
16+
</BuildMacro>
17+
<BuildMacro Include="BoostLibDir">
18+
<Value>$(BoostLibDir)</Value>
19+
</BuildMacro>
20+
<BuildMacro Include="XsdIncludeDir">
21+
<Value>$(XsdIncludeDir)</Value>
22+
</BuildMacro>
23+
<BuildMacro Include="XsdLibDir_x64">
24+
<Value>$(XsdLibDir_x64)</Value>
25+
</BuildMacro>
26+
<BuildMacro Include="XsdLibDir_Win32">
27+
<Value>$(XsdLibDir_Win32)</Value>
28+
</BuildMacro>
29+
</ItemGroup>
30+
</Project>

‎dynadjust/dynadjust.rc‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
// Microsoft Visual C++ generated resource script.
2+
//
3+
#include "resource.h"
4+
5+
#define APSTUDIO_READONLY_SYMBOLS
6+
/////////////////////////////////////////////////////////////////////////////
7+
//
8+
// Generated from the TEXTINCLUDE 2 resource.
9+
//
10+
#include "winres.h"
11+
12+
/////////////////////////////////////////////////////////////////////////////
13+
#undef APSTUDIO_READONLY_SYMBOLS
14+
15+
/////////////////////////////////////////////////////////////////////////////
16+
// English (United States) resources
17+
18+
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
19+
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
20+
#pragma code_page(1252)
21+
22+
/////////////////////////////////////////////////////////////////////////////
23+
//
24+
// Version
25+
//
26+
27+
VS_VERSION_INFO VERSIONINFO
28+
FILEVERSION 1,2,5,0
29+
PRODUCTVERSION 1,2,5,0
30+
FILEFLAGSMASK 0x3fL
31+
#ifdef _DEBUG
32+
FILEFLAGS 0x1L
33+
#else
34+
FILEFLAGS 0x0L
35+
#endif
36+
FILEOS 0x40004L
37+
FILETYPE 0x0L
38+
FILESUBTYPE 0x0L
39+
BEGIN
40+
BLOCK "StringFileInfo"
41+
BEGIN
42+
BLOCK "040904b0"
43+
BEGIN
44+
VALUE "FileDescription", "DynAdjust is a rigorous, high performance least squares adjustment application."
45+
VALUE "FileVersion", "1.2.5.0"
46+
VALUE "InternalName", "DynAdjust"
47+
VALUE "LegalCopyright", "Copyright 2022 Geoscience Australia"
48+
VALUE "OriginalFilename", "DynAdjust"
49+
VALUE "ProductName", "DynAdjust"
50+
VALUE "ProductVersion", "1.2.5.0"
51+
END
52+
END
53+
BLOCK "VarFileInfo"
54+
BEGIN
55+
VALUE "Translation", 0x409, 1200
56+
END
57+
END
58+
59+
#endif // English (United States) resources
60+
/////////////////////////////////////////////////////////////////////////////
61+
62+
63+
64+
#ifndef APSTUDIO_INVOKED
65+
/////////////////////////////////////////////////////////////////////////////
66+
//
67+
// Generated from the TEXTINCLUDE 3 resource.
68+
//
69+
70+
71+
/////////////////////////////////////////////////////////////////////////////
72+
#endif // not APSTUDIO_INVOKED

‎dynadjust/dynadjust/dnaadjust/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ add_library (${PROJECT_NAME} SHARED
2626
${CMAKE_SOURCE_DIR}/include/measurement_types/dnamsrtally.cpp
2727
${CMAKE_SOURCE_DIR}/include/memory/dnafile_mapping.cpp
2828
dnaadjust-stage.cpp
29-
dnaadjust.cpp)
29+
dnaadjust.cpp
30+
${CMAKE_SOURCE_DIR}/dynadjust.rc)
3031

3132
target_link_libraries (${PROJECT_NAME} ${DNA_LIBRARIES})
3233

‎dynadjust/dynadjust/dnaadjust/dnaadjust-multi.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ extern boost::exception_ptr rev_error;
3434
extern boost::exception_ptr cmb_error;
3535
extern boost::exception_ptr prep_error;
3636

37-
bool combineAdjustmentExceptionThrown(const vector<boost::exception_ptr>& cmb_errors_, const UINT32& thread_id)
37+
bool combineAdjustmentExceptionThrown(const vector<boost::exception_ptr>& cmb_errors_)
3838
{
3939
// got a forward or reverse exception, or
4040
// have any of the other combination adjustments failed?
@@ -58,7 +58,7 @@ bool combineAdjustmentExceptionThrown(const vector<boost::exception_ptr>& cmb_er
5858
return false;
5959
}
6060

61-
bool prepareAdjustmentExceptionThrown(const vector<boost::exception_ptr>& prep_errors_, const UINT32& thread_id)
61+
bool prepareAdjustmentExceptionThrown(const vector<boost::exception_ptr>& prep_errors_)
6262
{
6363
// have any of the other combination adjustments failed?
6464
UINT32 err_size(static_cast<UINT32>(prep_errors_.size()));
@@ -623,7 +623,7 @@ void adjust_process_combine_thread::operator()()
623623
break;
624624

625625
// Have any other adjustments failed?
626-
if (combineAdjustmentExceptionThrown(cmb_errors_, thread_id_))
626+
if (combineAdjustmentExceptionThrown(cmb_errors_))
627627
return;
628628

629629
// Wait here until blocks have been placed on the queue
@@ -634,7 +634,7 @@ void adjust_process_combine_thread::operator()()
634634
}
635635

636636
// Have any other adjustments failed?
637-
if (combineAdjustmentExceptionThrown(cmb_errors_, thread_id_))
637+
if (combineAdjustmentExceptionThrown(cmb_errors_))
638638
return;
639639

640640
main_adj_->isCombining_ = true;
@@ -644,7 +644,7 @@ void adjust_process_combine_thread::operator()()
644644
{
645645
// Least Squares Solution
646646
main_adj_->SolveMTTry(true, currentBlock);
647-
main_adj_->UpdateEstimatesCombine(currentBlock, pseudomsrJSLCount, true);
647+
main_adj_->UpdateEstimatesCombine(currentBlock, pseudomsrJSLCount);
648648
main_adj_->UpdateEstimatesFinal(currentBlock);
649649
}
650650
}
@@ -742,7 +742,7 @@ void adjust_process_prepare_thread::operator()()
742742
break;
743743

744744
// Have any other adjustments failed?
745-
if (prepareAdjustmentExceptionThrown(prep_errors_, thread_id_))
745+
if (prepareAdjustmentExceptionThrown(prep_errors_))
746746
return;
747747

748748
// Wait here until blocks have been placed on the queue
@@ -753,7 +753,7 @@ void adjust_process_prepare_thread::operator()()
753753
}
754754

755755
// Have any other adjustments failed?
756-
if (prepareAdjustmentExceptionThrown(prep_errors_, thread_id_))
756+
if (prepareAdjustmentExceptionThrown(prep_errors_))
757757
return;
758758

759759
main_adj_->SetcurrentBlock(currentBlock);

0 commit comments

Comments
 (0)