fly/terragear
1
0
Fork 0
Code Activity

Remove the newmat dependency and bring in TNT templates as a substitute

Browse source
This commit is contained in:
Christian Schmitt 2012-10-31 13:13:28 +01:00
parent e77e5d43d5
commit bf7d86732d
19 changed files with 1430 additions and 986 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -71,7 +71,6 @@ find_package(Threads REQUIRED)
find_package(SimGear 2.9.0 REQUIRED) find_package(SimGear 2.9.0 REQUIRED)
find_package(GDAL REQUIRED) find_package(GDAL REQUIRED)
find_package(TIFF REQUIRED) # needed for SRTM find_package(TIFF REQUIRED) # needed for SRTM
find_package(NewMat11 REQUIRED)
find_library(POCO_FOUNDATION PocoFoundation REQUIRED) find_library(POCO_FOUNDATION PocoFoundation REQUIRED)
find_library(POCO_NET PocoNet REQUIRED) find_library(POCO_NET PocoNet REQUIRED)

25
CMakeModules/FindNewMat11.cmake
View file

@ -1,25 +0,0 @@
FIND_PATH(NEWMAT_INCLUDE_DIR newmat/newmat.h
HINTS $ENV{NEWMAT_DIR}
PATH_SUFFIXES include
PATHS
/usr/local
/usr
/opt
)
FIND_LIBRARY(NEWMAT_LIBRARY
NAMES newmat
HINTS
$ENV{NEWMAT_DIR}
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS
/usr/local
/usr
/opt
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(newmat DEFAULT_MSG
NEWMAT_LIBRARY NEWMAT_INCLUDE_DIR)

25
README.newmat
View file

@ -1,25 +0,0 @@
You *must* have the newmat package installed on your system to build
the airport generator portion of TerraGear.
You can get the latest version of newmat from:
http://www.robertnz.net/nm_intro.htm
This package is distributed with several make files. Read the docs
(online) and follow those instructions to build the package. For
instance, to build on a typical "gnu" system:
- extract the package into a new subdirectory
- run "make -f nm_gnu.mak"
- copy the newly created libnewmat.a to /usr/local/lib
- make a new directory called /usr/local/include/newmat
- copy all the *.h files to /usr/local/include/newmat
Licensing terms:
The newmat11 documentation states: "There are no restrictions on the
use of newmat except that I take no liability for any problems that
may arise from this use."

26
projects/VC100/newmat11/newmat11.sln
View file

@ -1,26 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newmat11", "newmat11.vcxproj", "{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Debug|Win32.ActiveCfg = Debug|Win32
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Debug|Win32.Build.0 = Debug|Win32
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Debug|x64.ActiveCfg = Debug|x64
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Debug|x64.Build.0 = Debug|x64
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Release|Win32.ActiveCfg = Release|Win32
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Release|Win32.Build.0 = Release|Win32
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Release|x64.ActiveCfg = Release|x64
{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

412
projects/VC100/newmat11/newmat11.vcproj
View file

@ -1,412 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Name="newmat11"
ProjectGUID="{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}"
Keyword="Win32Proj"
TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
Name="Win32"
/>
<Platform
Name="x64"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/newmat11.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/newmat11.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/newmat11.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS"
RuntimeLibrary="2"
RuntimeTypeInfo="true"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/newmat11.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath="..\..\..\..\newmat\bandmat.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\cholesky.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\evalue.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\fft.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\hholder.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\jacobi.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\myexcept.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newfft.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat1.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat2.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat3.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat4.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat5.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat6.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat7.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat8.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat9.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmatex.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmatrm.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\nm_misc.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\sort.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\submat.cpp"
>
</File>
<File
RelativePath="..\..\..\..\newmat\svd.cpp"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath="..\..\..\..\newmat\myexcept.h"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmat.h"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmatap.h"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmatio.h"
>
</File>
<File
RelativePath="..\..\..\..\newmat\newmatrm.h"
>
</File>
</Filter>
<Filter
Name="Resource Files"
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

188
projects/VC100/newmat11/newmat11.vcxproj
View file

@ -1,188 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BAAE2014-7AB0-4AE7-BA70-AFD26E7EB15A}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Platform)\$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)d</TargetName>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)d</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)newmat11d.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)newmat11d.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)newmat11.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Midl>
<TargetEnvironment>X64</TargetEnvironment>
</Midl>
<ClCompile>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)newmat11.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\newmat\bandmat.cpp" />
<ClCompile Include="..\..\..\..\newmat\cholesky.cpp" />
<ClCompile Include="..\..\..\..\newmat\evalue.cpp" />
<ClCompile Include="..\..\..\..\newmat\fft.cpp" />
<ClCompile Include="..\..\..\..\newmat\hholder.cpp" />
<ClCompile Include="..\..\..\..\newmat\jacobi.cpp" />
<ClCompile Include="..\..\..\..\newmat\myexcept.cpp" />
<ClCompile Include="..\..\..\..\newmat\newfft.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat1.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat2.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat3.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat4.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat5.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat6.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat7.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat8.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmat9.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmatex.cpp" />
<ClCompile Include="..\..\..\..\newmat\newmatrm.cpp" />
<ClCompile Include="..\..\..\..\newmat\nm_misc.cpp" />
<ClCompile Include="..\..\..\..\newmat\sort.cpp" />
<ClCompile Include="..\..\..\..\newmat\submat.cpp" />
<ClCompile Include="..\..\..\..\newmat\svd.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\newmat\myexcept.h" />
<ClInclude Include="..\..\..\..\newmat\newmat.h" />
<ClInclude Include="..\..\..\..\newmat\newmatap.h" />
<ClInclude Include="..\..\..\..\newmat\newmatio.h" />
<ClInclude Include="..\..\..\..\newmat\newmatrm.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

105
projects/VC100/newmat11/newmat11.vcxproj.filters
View file

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\newmat\bandmat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\cholesky.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\evalue.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\fft.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\hholder.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\jacobi.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\myexcept.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newfft.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat1.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat2.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat3.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat4.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat5.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat6.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat7.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat8.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmat9.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmatex.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\newmatrm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\nm_misc.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\sort.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\submat.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\newmat\svd.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\newmat\myexcept.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\newmat\newmat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\newmat\newmatap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\newmat\newmatio.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\newmat\newmatrm.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>

4
src/Airports/CMakeLists.txt
View file

@ -1,6 +1,4 @@
include_directories(${PROJECT_SOURCE_DIR}/src/Lib) include_directories(${PROJECT_SOURCE_DIR}/src/Lib)
include_directories(${PROJECT_SOURCE_DIR}/src/BuildTiles) include_directories(${PROJECT_SOURCE_DIR}/src/BuildTiles)
if (NEWMAT_FOUND) add_subdirectory(GenAirports850)
add_subdirectory(GenAirports850)
endif (NEWMAT_FOUND)

3
src/Airports/GenAirports850/CMakeLists.txt
View file

@ -1,5 +1,3 @@
include_directories(${NEWMAT_INCLUDE_DIR})
add_executable(genapts850 add_executable(genapts850
airport.hxx airport.cxx airport.hxx airport.cxx
apt_math.hxx apt_math.cxx apt_math.hxx apt_math.cxx
@ -30,7 +28,6 @@ target_link_libraries(genapts850
${GDAL_LIBRARY} ${GDAL_LIBRARY}
${SIMGEAR_CORE_LIBRARIES} ${SIMGEAR_CORE_LIBRARIES}
${SIMGEAR_CORE_LIBRARY_DEPENDENCIES} ${SIMGEAR_CORE_LIBRARY_DEPENDENCIES}
${NEWMAT_LIBRARY}
${RT_LIBRARY}) ${RT_LIBRARY})
install(TARGETS genapts850 RUNTIME DESTINATION bin) install(TARGETS genapts850 RUNTIME DESTINATION bin)

2
src/Airports/GenAirports850/airport.cxx
View file

@ -1586,7 +1586,7 @@ void Airport::BuildBtg(const string& root, const string_list& elev_src )
// add light points // add light points
superpoly_list tmp_light_list; superpoly_list tmp_light_list;
tmp_light_list.clear(); tmp_light_list.clear();
typedef map < string, double, less<string> > elev_map_type; typedef std::map < string, double, std::less<string> > elev_map_type;
typedef elev_map_type::const_iterator const_elev_map_iterator; typedef elev_map_type::const_iterator const_elev_map_iterator;
elev_map_type elevation_map; elev_map_type elevation_map;

203
src/Airports/GenAirports850/apt_surface.cxx
View file

@ -19,29 +19,19 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
// //
// $Id: apt_surface.cxx,v 1.31 2005-12-19 16:51:25 curt Exp $
//
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
#include <Lib/Geometry/TNT/jama_qr.h>
#include <simgear/compiler.h> #include <simgear/compiler.h>
// libnewmat includes and defines
#define WANT_STREAM // include.h will get stream fns
#define WANT_MATH // include.h will get math fns
// newmatap.h will get include.h
#include <newmat/newmatap.h> // need matrix applications
#include <newmat/newmatio.h> // need matrix output routines
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/sg_types.hxx> #include <simgear/math/sg_types.hxx>
#include <simgear/debug/logstream.hxx> #include <simgear/debug/logstream.hxx>
#include <Array/array.hxx>
#include "elevations.hxx" #include "elevations.hxx"
#include "global.hxx" #include "global.hxx"
#include "apt_surface.hxx" #include "apt_surface.hxx"
@ -103,7 +93,7 @@ static bool limit_slope( SimpleMatrix *Pts, int i1, int j1, int i2, int j2,
// Constructor, specify min and max coordinates of desired area in // Constructor, specify min and max coordinates of desired area in
// lon/lat degrees // lon/lat degrees
TGAptSurface::TGAptSurface( const string& path, TGAptSurface::TGAptSurface( const std::string& path,
const string_list& elev_src, const string_list& elev_src,
Point3D _min_deg, Point3D _max_deg, Point3D _min_deg, Point3D _max_deg,
double _average_elev_m ) double _average_elev_m )
@ -300,145 +290,60 @@ TGAptSurface::~TGAptSurface() {
} }
static ColumnVector qr_method( Real* y,
Real* t1, Real* t2, Real* t3, Real* t4,
Real* t5, Real* t6, Real* t7, Real* t8,
Real* t9, Real* t10, Real* t11, Real* t12,
Real* t13, Real* t14, Real* t15,
int nobs, int npred )
{
SG_LOG(SG_GENERAL, SG_DEBUG, "QR triangularisation" );
// QR triangularisation method
// load data - 1s into col 1 of matrix
int npred1 = npred+1;
SG_LOG(SG_GENERAL, SG_DEBUG, "nobs = " << nobs << " npred1 = " << npred1 );
Matrix X(nobs,npred1); ColumnVector Y(nobs);
X.column(1) = 1.0;
X.column(2) << t1;
X.column(3) << t2;
X.column(4) << t3;
X.column(5) << t4;
X.column(6) << t5;
X.column(7) << t6;
X.column(8) << t7;
X.column(9) << t8;
X.column(10) << t9;
X.column(11) << t10;
X.column(12) << t11;
X.column(13) << t12;
X.column(14) << t13;
X.column(15) << t14;
X.column(16) << t15;
Y << y;
// do Householder triangularisation
// no need to deal with constant term separately
Matrix X1 = X; // Want copy of matrix
ColumnVector Y1 = Y;
UpperTriangularMatrix U; ColumnVector M;
QRZ(X1, U); QRZ(X1, Y1, M); // Y1 now contains resids
ColumnVector A = U.i() * M;
ColumnVector Fitted = X * A;
// get variances of estimates
U = U.i(); DiagonalMatrix D; D << U * U.t();
// Get diagonals of Hat matrix
DiagonalMatrix Hat; Hat << X1 * X1.t();
#ifdef DEBUG
cout << "A vector = " << A << endl;
cout << "A rows = " << A.nrows() << endl;
// print out answers
cout << "\nEstimates and their standard errors\n\n";
ColumnVector SE(npred1);
for (int i=1; i<=npred1; i++) SE(i) = sqrt(D(i)*ResVar);
cout << setw(11) << setprecision(5) << (A | SE) << endl;
cout << "\nObservations, fitted value, residual value, hat value\n";
cout << setw(9) << setprecision(3) <<
(X.columns(2,4) | Y | Fitted | Y1 | Hat.as_column());
cout << "\n\n";
#endif
return A;
}
// Use a linear least squares method to fit a 3d polynomial to the // Use a linear least squares method to fit a 3d polynomial to the
// sampled surface data // sampled surface data
void TGAptSurface::fit() { void TGAptSurface::fit() {
// the fit function is: // the fit function is:
// f(x,y) = A1*x + A2*x*y + A3*y + // f(x,y) = A1*x + A2*x*y + A3*y +
// A4*x*x + A5+x*x*y + A6*x*x*y*y + A7*y*y + A8*x*y*y + // A4*x*x + A5+x*x*y + A6*x*x*y*y + A7*y*y + A8*x*y*y +
// A9*x*x*x + A10*x*x*x*y + A11*x*x*x*y*y + A12*x*x*x*y*y*y + // A9*x*x*x + A10*x*x*x*y + A11*x*x*x*y*y + A12*x*x*x*y*y*y +
// A13*y*y*y + A14*x*y*y*y + A15*x*x*y*y*y // A13*y*y*y + A14*x*y*y*y + A15*x*x*y*y*y
int nobs = Pts->cols() * Pts->rows(); // number of observations int nobs = Pts->cols() * Pts->rows(); // number of observations
int npred = 15; // number of predictor values A[n]
vector<Real> tz(nobs); SG_LOG(SG_GENERAL, SG_DEBUG, "QR triangularisation" );
vector<Real> t1(nobs);
vector<Real> t2(nobs);
vector<Real> t3(nobs);
vector<Real> t4(nobs);
vector<Real> t5(nobs);
vector<Real> t6(nobs);
vector<Real> t7(nobs);
vector<Real> t8(nobs);
vector<Real> t9(nobs);
vector<Real> t10(nobs);
vector<Real> t11(nobs);
vector<Real> t12(nobs);
vector<Real> t13(nobs);
vector<Real> t14(nobs);
vector<Real> t15(nobs);
// generate the required fit data // Create an array (matrix) with 16 columns (predictor values) A[n]
for ( int j = 0; j < Pts->rows(); j++ ) { TNT::Array2D<double> mat(nobs,16);
for ( int i = 0; i < Pts->cols(); i++ ) {
Point3D p = Pts->element( i, j ); // put all elevation values into a second array
int index = ( j * Pts->cols() ) + i; TNT::Array1D<double> zmat(nobs);
Real x = p.x() - offset.x();
Real y = p.y() - offset.y(); // generate the required fit data
Real z = p.z() - offset.z(); for ( int j = 0; j < Pts->rows(); j++ ) {
//cout << "pt = " << x << "," << y << "," << z << endl; for ( int i = 0; i < Pts->cols(); i++ ) {
tz[index] = z; Point3D p = Pts->element( i, j );
t1[index] = x; int index = ( j * Pts->cols() ) + i;
t2[index] = x*y; double x = p.x() - offset.x();
t3[index] = y; double y = p.y() - offset.y();
t4[index] = x*x; double z = p.z() - offset.z();
t5[index] = x*x*y;
t6[index] = x*x*y*y; zmat[index] = z;
t7[index] = y*y;
t8[index] = x*y*y; mat[index][0] = 1.0;
t9[index] = x*x*x; mat[index][1] = x;
t10[index] = x*x*x*y; mat[index][2] = x*y;
t11[index] = x*x*x*y*y; mat[index][3] = y;
t12[index] = x*x*x*y*y*y; mat[index][4] = x*x;
t13[index] = y*y*y; mat[index][5] = x*x*y;
t14[index] = x*y*y*y; mat[index][6] = x*x*y*y;
t15[index] = x*x*y*y*y; mat[index][7] = y*y;
mat[index][8] = x*y*y;
mat[index][9] = x*x*x;
mat[index][10] = x*x*x*y;
mat[index][11] = x*x*x*y*y;
mat[index][12] = x*x*x*y*y*y;
mat[index][13] = y*y*y;
mat[index][14] = x*y*y*y;
mat[index][15] = x*x*y*y*y;
}
} }
}
// we want to find the values of a,b,c to give the best // Do QR decompostion
// fit JAMA::QR<double> qr( mat );
// find the least squares solution using the QR factors
Try { surface_coefficients = qr.solve(zmat);
surface_coefficients
= qr_method( &tz[0],
&t1[0], &t2[0], &t3[0], &t4[0], &t5[0], &t6[0], &t7[0], &t8[0],
&t9[0], &t10[0], &t11[0], &t12[0], &t13[0], &t14[0], &t15[0],
nobs, npred
);
SG_LOG(SG_GENERAL, SG_DEBUG, "surface_coefficients size = " << surface_coefficients.nrows() );
}
CatchAll { cout << BaseException::what(); }
} }
@ -463,15 +368,13 @@ double TGAptSurface::query( double lon_deg, double lat_deg ) {
double x = lon_deg - offset.x(); double x = lon_deg - offset.x();
double y = lat_deg - offset.y(); double y = lat_deg - offset.y();
ColumnVector A = surface_coefficients; TNT::Array1D<double> A = surface_coefficients;
double result = A(1) + A(2)*x + A(3)*x*y + A(4)*y + A(5)*x*x + A(6)*x*x*y double result = A[0] + A[1]*x + A[2]*x*y + A[3]*y + A[4]*x*x + A[5]*x*x*y
+ A(7)*x*x*y*y + A(8)*y*y + A(9)*x*y*y + A(10)*x*x*x + A(11)*x*x*x*y + A[6]*x*x*y*y + A[7]*y*y + A[8]*x*y*y + A[9]*x*x*x + A[10]*x*x*x*y
+ A(12)*x*x*x*y*y + A(13)*x*x*x*y*y*y + A(14)*y*y*y + A(15)*x*y*y*y + A[11]*x*x*x*y*y + A[12]*x*x*x*y*y*y + A[13]*y*y*y + A[14]*x*y*y*y
+ A(16)*x*x*y*y*y; + A[15]*x*x*y*y*y;
result += offset.z(); result += offset.z();
// printf("result = %.6f %.6f %.2f\n", lon_deg, lat_deg, result);
return result; return result;
} }

29
src/Airports/GenAirports850/apt_surface.hxx
View file

@ -19,8 +19,6 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
// //
// $Id: apt_surface.hxx,v 1.9 2005-09-09 20:47:04 curt Exp $
//
#ifndef _APT_SURFACE_HXX #ifndef _APT_SURFACE_HXX
@ -28,15 +26,10 @@
#include <string> #include <string>
#include <Lib/Geometry/TNT/tnt_array2d.h>
// libnewmat includes and defines #include <simgear/debug/logstream.hxx>
#define WANT_STREAM // include.h will get stream fns #include <Lib/Geometry/point3d.hxx>
#define WANT_MATH // include.h will get math fns
// newmatap.h will get include.h
#include <newmat/newmatap.h> // need matrix applications
#include <newmat/newmatio.h> // need matrix output routines
#include <Geometry/point3d.hxx>
/*** /***
@ -62,12 +55,10 @@ public:
inline Point3D element( int col, int row ) { inline Point3D element( int col, int row ) {
int index = ( row * _cols ) + col; int index = ( row * _cols ) + col;
if ( col < 0 || col >= _cols ) { if ( col < 0 || col >= _cols ) {
cout << "column out of bounds on read (" << col << " >= " << _cols << ")" SG_LOG(SG_GENERAL, SG_WARN, "column out of bounds on read (" << col << " >= " << _cols << ")");
<< endl;
int *p = 0; *p = 1; // force crash int *p = 0; *p = 1; // force crash
} else if ( row < 0 || row >= _rows ) { } else if ( row < 0 || row >= _rows ) {
cout << "row out of bounds on read (" << row << " >= " << _rows << ")" SG_LOG(SG_GENERAL, SG_WARN, "row out of bounds on read (" << row << " >= " << _rows << ")");
<< endl;
int *p = 0; *p = 1; // force crash int *p = 0; *p = 1; // force crash
} }
return m[index]; return m[index];
@ -76,12 +67,10 @@ public:
inline void set( int col, int row, Point3D p ) { inline void set( int col, int row, Point3D p ) {
int index = ( row * _cols ) + col; int index = ( row * _cols ) + col;
if ( col < 0 || col >= _cols ) { if ( col < 0 || col >= _cols ) {
cout << "column out of bounds on set (" << col << " >= " << _cols << ")" SG_LOG(SG_GENERAL, SG_WARN,"column out of bounds on set (" << col << " >= " << _cols << ")");
<< endl;
int *p = 0; *p = 1; // force crash int *p = 0; *p = 1; // force crash
} else if ( row < 0 || row >= _rows ) { } else if ( row < 0 || row >= _rows ) {
cout << "row out of bounds on set (" << row << " >= " << _rows << ")" SG_LOG(SG_GENERAL, SG_WARN,"row out of bounds on set (" << row << " >= " << _rows << ")");
<< endl;
int *p = 0; *p = 1; // force crash int *p = 0; *p = 1; // force crash
} }
m[index] = p; m[index] = p;
@ -111,7 +100,7 @@ private:
// The actual nurbs surface approximation for the airport // The actual nurbs surface approximation for the airport
SimpleMatrix *Pts; SimpleMatrix *Pts;
ColumnVector surface_coefficients; TNT::Array1D<double> surface_coefficients;
Point3D min_deg, max_deg; Point3D min_deg, max_deg;
@ -127,7 +116,7 @@ public:
// Constructor, specify min and max coordinates of desired area in // Constructor, specify min and max coordinates of desired area in
// lon/lat degrees, also please specify an "average" airport // lon/lat degrees, also please specify an "average" airport
// elevations in meters. // elevations in meters.
TGAptSurface( const string &path, const string_list& elev_src, TGAptSurface( const std::string &path, const string_list& elev_src,
Point3D _min_deg, Point3D _max_deg, double _average_elev_m ); Point3D _min_deg, Point3D _max_deg, double _average_elev_m );
// Destructor // Destructor

21
src/Airports/GenAirports850/elevations.cxx
View file

@ -19,20 +19,11 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
// //
// $Id: elevations.cxx,v 1.8 2005-12-19 16:51:25 curt Exp $
//
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif
// libnewmat includes and defines
#define WANT_STREAM // include.h will get stream fns
#define WANT_MATH // include.h will get math fns
// newmatap.h will get include.h
#include <newmat/newmatap.h> // need matrix applications
#include <newmat/newmatio.h> // need matrix output routines
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
#include <simgear/math/sg_types.hxx> #include <simgear/math/sg_types.hxx>
@ -47,7 +38,7 @@
// lookup node elevations for each point in the point_list. Returns // lookup node elevations for each point in the point_list. Returns
// average of all points. Doesn't modify the original list. // average of all points. Doesn't modify the original list.
double tgAverageElevation( const string &root, const string_list elev_src, double tgAverageElevation( const std::string &root, const string_list elev_src,
const point_list points_source ) const point_list points_source )
{ {
bool done = false; bool done = false;
@ -82,13 +73,13 @@ double tgAverageElevation( const string &root, const string_list elev_src,
if ( found_one ) { if ( found_one ) {
SGBucket b( first.x(), first.y() ); SGBucket b( first.x(), first.y() );
string base = b.gen_base_path(); std::string base = b.gen_base_path();
// try the various elevation sources // try the various elevation sources
i = 0; i = 0;
bool found_file = false; bool found_file = false;
while ( !found_file && i < elev_src.size() ) { while ( !found_file && i < elev_src.size() ) {
string array_path = root + "/" + elev_src[i] + "/" + base + "/" + b.gen_index_str(); std::string array_path = root + "/" + elev_src[i] + "/" + base + "/" + b.gen_index_str();
if ( array.open(array_path) ) { if ( array.open(array_path) ) {
found_file = true; found_file = true;
@ -145,7 +136,7 @@ double tgAverageElevation( const string &root, const string_list elev_src,
// lookup node elevations for each point in the specified simple // lookup node elevations for each point in the specified simple
// matrix. Returns average of all points. // matrix. Returns average of all points.
void tgCalcElevations( const string &root, const string_list elev_src, void tgCalcElevations( const std::string &root, const string_list elev_src,
SimpleMatrix &Pts, const double average ) SimpleMatrix &Pts, const double average )
{ {
bool done = false; bool done = false;
@ -182,13 +173,13 @@ void tgCalcElevations( const string &root, const string_list elev_src,
if ( found_one ) { if ( found_one ) {
SGBucket b( first.x(), first.y() ); SGBucket b( first.x(), first.y() );
string base = b.gen_base_path(); std::string base = b.gen_base_path();
// try the various elevation sources // try the various elevation sources
j = 0; j = 0;
bool found_file = false; bool found_file = false;
while ( !found_file && j < (int)elev_src.size() ) { while ( !found_file && j < (int)elev_src.size() ) {
string array_path = root + "/" + elev_src[j] + "/" + base + "/" + b.gen_index_str(); std::string array_path = root + "/" + elev_src[j] + "/" + base + "/" + b.gen_index_str();
if ( array.open(array_path) ) { if ( array.open(array_path) ) {
found_file = true; found_file = true;

14
src/Airports/GenAirports850/elevations.hxx
View file

@ -19,16 +19,6 @@
// along with this program; if not, write to the Free Software // along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
// //
// $Id: elevations.hxx,v 1.4 2005-09-09 15:05:15 curt Exp $
//
// libnewmat includes and defines
#define WANT_STREAM // include.h will get stream fns
#define WANT_MATH // include.h will get math fns
// newmatap.h will get include.h
#include <newmat/newmatap.h> // need matrix applications
#include <newmat/newmatio.h> // need matrix output routines
#include <simgear/constants.h> #include <simgear/constants.h>
#include <simgear/math/sg_geodesy.hxx> #include <simgear/math/sg_geodesy.hxx>
@ -43,12 +33,12 @@
// lookup node elevations for each point in the point_list. Returns // lookup node elevations for each point in the point_list. Returns
// average of all points. Doesn't modify the original list. // average of all points. Doesn't modify the original list.
double tgAverageElevation( const string &root, const string_list elev_src, double tgAverageElevation( const std::string &root, const string_list elev_src,
const point_list points_source ); const point_list points_source );
// lookup node elevations for each point in the specified nurbs++ // lookup node elevations for each point in the specified nurbs++
// matrix. // matrix.
void tgCalcElevations( const string &root, const string_list elev_src, SimpleMatrix &Pts, double average ); void tgCalcElevations( const std::string &root, const string_list elev_src, SimpleMatrix &Pts, double average );
// clamp all elevations to the specified range // clamp all elevations to the specified range
void tgClampElevations( SimpleMatrix &Pts, double center_m, double max_clamp_m ); void tgClampElevations( SimpleMatrix &Pts, double center_m, double max_clamp_m );

326
src/Lib/Geometry/TNT/jama_qr.h Normal file
View file

@ -0,0 +1,326 @@
#ifndef JAMA_QR_H
#define JAMA_QR_H
#include "tnt_array1d.h"
#include "tnt_array2d.h"
#include "tnt_math_utils.h"
namespace JAMA
{
/**
<p>
Classical QR Decompisition:
for an m-by-n matrix A with m >= n, the QR decomposition is an m-by-n
orthogonal matrix Q and an n-by-n upper triangular matrix R so that
A = Q*R.
<P>
The QR decompostion always exists, even if the matrix does not have
full rank, so the constructor will never fail. The primary use of the
QR decomposition is in the least squares solution of nonsquare systems
of simultaneous linear equations. This will fail if isFullRank()
returns 0 (false).
<p>
The Q and R factors can be retrived via the getQ() and getR()
methods. Furthermore, a solve() method is provided to find the
least squares solution of Ax=b using the QR factors.
<p>
(Adapted from JAMA, a Java Matrix Library, developed by jointly
by the Mathworks and NIST; see http://math.nist.gov/javanumerics/jama).
*/
template <class Real>
class QR {
/** Array for internal storage of decomposition.
@serial internal array storage.
*/
TNT::Array2D<Real> QR_;
/** Row and column dimensions.
@serial column dimension.
@serial row dimension.
*/
int m, n;
/** Array for internal storage of diagonal of R.
@serial diagonal of R.
*/
TNT::Array1D<Real> Rdiag;
public:
/**
Create a QR factorization object for A.
@param A rectangular (m>=n) matrix.
*/
QR(const TNT::Array2D<Real> &A) /* constructor */
{
QR_ = A.copy();
m = A.dim1();
n = A.dim2();
Rdiag = TNT::Array1D<Real>(n);
int i=0, j=0, k=0;
// Main loop.
for (k = 0; k < n; k++) {
// Compute 2-norm of k-th column without under/overflow.
Real nrm = 0;
for (i = k; i < m; i++) {
nrm = TNT::hypot(nrm,QR_[i][k]);
}
if (nrm != 0.0) {
// Form k-th Householder vector.
if (QR_[k][k] < 0) {
nrm = -nrm;
}
for (i = k; i < m; i++) {
QR_[i][k] /= nrm;
}
QR_[k][k] += 1.0;
// Apply transformation to remaining columns.
for (j = k+1; j < n; j++) {
Real s = 0.0;
for (i = k; i < m; i++) {
s += QR_[i][k]*QR_[i][j];
}
s = -s/QR_[k][k];
for (i = k; i < m; i++) {
QR_[i][j] += s*QR_[i][k];
}
}
}
Rdiag[k] = -nrm;
}
}
/**
Flag to denote the matrix is of full rank.
@return 1 if matrix is full rank, 0 otherwise.
*/
int isFullRank() const
{
for (int j = 0; j < n; j++)
{
if (Rdiag[j] == 0)
return 0;
}
return 1;
}
/**
Retreive the Householder vectors from QR factorization
@returns lower trapezoidal matrix whose columns define the reflections
*/
TNT::Array2D<Real> getHouseholder (void) const
{
TNT::Array2D<Real> H(m,n);
/* note: H is completely filled in by algorithm, so
initializaiton of H is not necessary.
*/
for (int i = 0; i < m; i++)
{
for (int j = 0; j < n; j++)
{
if (i >= j) {
H[i][j] = QR_[i][j];
} else {
H[i][j] = 0.0;
}
}
}
return H;
}
/** Return the upper triangular factor, R, of the QR factorization
@return R
*/
TNT::Array2D<Real> getR() const
{
TNT::Array2D<Real> R(n,n);
for (int i = 0; i < n; i++) {
for (int j = 0; j < n; j++) {
if (i < j) {
R[i][j] = QR_[i][j];
} else if (i == j) {
R[i][j] = Rdiag[i];
} else {
R[i][j] = 0.0;
}
}
}
return R;
}
/**
Generate and return the (economy-sized) orthogonal factor
@param Q the (ecnomy-sized) orthogonal factor (Q*R=A).
*/
TNT::Array2D<Real> getQ() const
{
int i=0, j=0, k=0;
TNT::Array2D<Real> Q(m,n);
for (k = n-1; k >= 0; k--) {
for (i = 0; i < m; i++) {
Q[i][k] = 0.0;
}
Q[k][k] = 1.0;
for (j = k; j < n; j++) {
if (QR_[k][k] != 0) {
Real s = 0.0;
for (i = k; i < m; i++) {
s += QR_[i][k]*Q[i][j];
}
s = -s/QR_[k][k];
for (i = k; i < m; i++) {
Q[i][j] += s*QR_[i][k];
}
}
}
}
return Q;
}
/** Least squares solution of A*x = b
@param B m-length array (vector).
@return x n-length array (vector) that minimizes the two norm of Q*R*X-B.
If B is non-conformant, or if QR.isFullRank() is false,
the routine returns a null (0-length) vector.
*/
TNT::Array1D<Real> solve(const TNT::Array1D<Real> &b) const
{
if (b.dim1() != m) /* arrays must be conformant */
return TNT::Array1D<Real>();
if ( !isFullRank() ) /* matrix is rank deficient */
{
return TNT::Array1D<Real>();
}
TNT::Array1D<Real> x = b.copy();
// Compute Y = transpose(Q)*b
for (int k = 0; k < n; k++)
{
Real s = 0.0;
for (int i = k; i < m; i++)
{
s += QR_[i][k]*x[i];
}
s = -s/QR_[k][k];
for (int i = k; i < m; i++)
{
x[i] += s*QR_[i][k];
}
}
// Solve R*X = Y;
for (int k = n-1; k >= 0; k--)
{
x[k] /= Rdiag[k];
for (int i = 0; i < k; i++) {
x[i] -= x[k]*QR_[i][k];
}
}
/* return n x nx portion of X */
TNT::Array1D<Real> x_(n);
for (int i=0; i<n; i++)
x_[i] = x[i];
return x_;
}
/** Least squares solution of A*X = B
@param B m x k Array (must conform).
@return X n x k Array that minimizes the two norm of Q*R*X-B. If
B is non-conformant, or if QR.isFullRank() is false,
the routine returns a null (0x0) array.
*/
TNT::Array2D<Real> solve(const TNT::Array2D<Real> &B) const
{
if (B.dim1() != m) /* arrays must be conformant */
return TNT::Array2D<Real>(0,0);
if ( !isFullRank() ) /* matrix is rank deficient */
{
return TNT::Array2D<Real>(0,0);
}
int nx = B.dim2();
TNT::Array2D<Real> X = B.copy();
int i=0, j=0, k=0;
// Compute Y = transpose(Q)*B
for (k = 0; k < n; k++) {
for (j = 0; j < nx; j++) {
Real s = 0.0;
for (i = k; i < m; i++) {
s += QR_[i][k]*X[i][j];
}
s = -s/QR_[k][k];
for (i = k; i < m; i++) {
X[i][j] += s*QR_[i][k];
}
}
}
// Solve R*X = Y;
for (k = n-1; k >= 0; k--) {
for (j = 0; j < nx; j++) {
X[k][j] /= Rdiag[k];
}
for (i = 0; i < k; i++) {
for (j = 0; j < nx; j++) {
X[i][j] -= X[k][j]*QR_[i][k];
}
}
}
/* return n x nx portion of X */
TNT::Array2D<Real> X_(n,nx);
for (i=0; i<n; i++)
for (j=0; j<nx; j++)
X_[i][j] = X[i][j];
return X_;
}
};
}
// namespace JAMA
#endif
// JAMA_QR__H

301
src/Lib/Geometry/TNT/tnt_array1d.h Normal file
View file

@ -0,0 +1,301 @@
/*
*
* Template Numerical Toolkit (TNT)
*
* Mathematical and Computational Sciences Division
* National Institute of Technology,
* Gaithersburg, MD USA
*
*
* This software was developed at the National Institute of Standards and
* Technology (NIST) by employees of the Federal Government in the course
* of their official duties. Pursuant to title 17 Section 105 of the
* United States Code, this software is not subject to copyright protection
* and is in the public domain. NIST assumes no responsibility whatsoever for
* its use by other parties, and makes no guarantees, expressed or implied,
* about its quality, reliability, or any other characteristic.
*
*/
#ifndef TNT_ARRAY1D_H
#define TNT_ARRAY1D_H
//#include <cstdlib>
#include <iostream>
#ifdef TNT_BOUNDS_CHECK
#include <assert.h>
#endif
#include "tnt_i_refvec.h"
namespace TNT
{
template <class T>
class Array1D
{
private:
/* ... */
i_refvec<T> v_;
int n_;
T* data_; /* this normally points to v_.begin(), but
* could also point to a portion (subvector)
* of v_.
*/
void copy_(T* p, const T* q, int len) const;
void set_(T* begin, T* end, const T& val);
public:
typedef T value_type;
Array1D();
explicit Array1D(int n);
Array1D(int n, const T &a);
Array1D(int n, T *a);
inline Array1D(const Array1D &A);
inline operator T*();
inline operator const T*();
inline Array1D & operator=(const T &a);
inline Array1D & operator=(const Array1D &A);
inline Array1D & ref(const Array1D &A);
Array1D copy() const;
Array1D & inject(const Array1D & A);
inline T& operator[](int i);
inline T& operator()(int i);
inline const T& operator[](int i) const;
inline const T& operator()(int i) const;
inline int dim1() const;
inline int dim() const;
~Array1D();
/* ... extended interface ... */
inline int ref_count() const;
inline Array1D<T> subarray(int i0, int i1);
};
template <class T>
Array1D<T>::Array1D() : v_(), n_(0), data_(0) {}
template <class T>
Array1D<T>::Array1D(const Array1D<T> &A) : v_(A.v_), n_(A.n_),
data_(A.data_)
{
#ifdef TNT_DEBUG
std::cout << "Created Array1D(const Array1D<T> &A) \n";
#endif
}
template <class T>
Array1D<T>::Array1D(int n) : v_(n), n_(n), data_(v_.begin())
{
#ifdef TNT_DEBUG
std::cout << "Created Array1D(int n) \n";
#endif
}
template <class T>
Array1D<T>::Array1D(int n, const T &val) : v_(n), n_(n), data_(v_.begin())
{
#ifdef TNT_DEBUG
std::cout << "Created Array1D(int n, const T& val) \n";
#endif
set_(data_, data_+ n, val);
}
template <class T>
Array1D<T>::Array1D(int n, T *a) : v_(a), n_(n) , data_(v_.begin())
{
#ifdef TNT_DEBUG
std::cout << "Created Array1D(int n, T* a) \n";
#endif
}
template <class T>
inline Array1D<T>::operator T*()
{
return &(v_[0]);
}
template <class T>
inline Array1D<T>::operator const T*()
{
return &(v_[0]);
}
template <class T>
inline T& Array1D<T>::operator[](int i)
{
#ifdef TNT_BOUNDS_CHECK
assert(i>= 0);
assert(i < n_);
#endif
return data_[i];
}
template <class T>
inline const T& Array1D<T>::operator[](int i) const
{
#ifdef TNT_BOUNDS_CHECK
assert(i>= 0);
assert(i < n_);
#endif
return data_[i];
}
template <class T>
inline T& Array1D<T>::operator()(int i)
{
#ifdef TNT_BOUNDS_CHECK
assert(i>= 0);
assert(i < n_);
#endif
return data_[i-1];
}
template <class T>
inline const T& Array1D<T>::operator()(int i) const
{
#ifdef TNT_BOUNDS_CHECK
assert(i>= 0);
assert(i < n_);
#endif
return data_[i-1];
}
template <class T>
Array1D<T> & Array1D<T>::operator=(const T &a)
{
set_(data_, data_+n_, a);
return *this;
}
template <class T>
Array1D<T> Array1D<T>::copy() const
{
Array1D A( n_);
copy_(A.data_, data_, n_);
return A;
}
template <class T>
Array1D<T> & Array1D<T>::inject(const Array1D &A)
{
if (A.n_ == n_)
copy_(data_, A.data_, n_);
return *this;
}
template <class T>
Array1D<T> & Array1D<T>::ref(const Array1D<T> &A)
{
if (this != &A)
{
v_ = A.v_; /* operator= handles the reference counting. */
n_ = A.n_;
data_ = A.data_;
}
return *this;
}
template <class T>
Array1D<T> & Array1D<T>::operator=(const Array1D<T> &A)
{
return ref(A);
}
template <class T>
inline int Array1D<T>::dim1() const { return n_; }
template <class T>
inline int Array1D<T>::dim() const { return n_; }
template <class T>
Array1D<T>::~Array1D() {}
/* ............................ exented interface ......................*/
template <class T>
inline int Array1D<T>::ref_count() const
{
return v_.ref_count();
}
template <class T>
inline Array1D<T> Array1D<T>::subarray(int i0, int i1)
{
if ((i0 >= 0) && (i1 < n_) || (i0 <= i1))
{
Array1D<T> X(*this); /* create a new instance of this array. */
X.n_ = i1-i0+1;
X.data_ += i0;
return X;
}
else
{
return Array1D<T>();
}
}
/* private internal functions */
template <class T>
void Array1D<T>::set_(T* begin, T* end, const T& a)
{
for (T* p=begin; p<end; p++)
*p = a;
}
template <class T>
void Array1D<T>::copy_(T* p, const T* q, int len) const
{
T *end = p + len;
while (p<end )
*p++ = *q++;
}
} /* namespace TNT */
#endif
/* TNT_ARRAY1D_H */

451
src/Lib/Geometry/TNT/tnt_array2d.h Normal file
View file

@ -0,0 +1,451 @@
/*
*
* Template Numerical Toolkit (TNT)
*
* Mathematical and Computational Sciences Division
* National Institute of Technology,
* Gaithersburg, MD USA
*
*
* This software was developed at the National Institute of Standards and
* Technology (NIST) by employees of the Federal Government in the course
* of their official duties. Pursuant to title 17 Section 105 of the
* United States Code, this software is not subject to copyright protection
* and is in the public domain. NIST assumes no responsibility whatsoever for
* its use by other parties, and makes no guarantees, expressed or implied,
* about its quality, reliability, or any other characteristic.
*
*/
#ifndef TNT_ARRAY2D_H
#define TNT_ARRAY2D_H
#include <cstdlib>
#include <iostream>
#ifdef TNT_BOUNDS_CHECK
#include <assert.h>
#endif
#include "tnt_array1d.h"
namespace TNT
{
/**
Ttwo-dimensional numerical array which
looks like a conventional C multiarray.
Storage corresponds to C (row-major) ordering.
Elements are accessed via A[i][j] notation for 0-based indexing,
and A(i,j) for 1-based indexing..
<p>
Array assignment is by reference (i.e. shallow assignment).
That is, B=A implies that the A and B point to the
same array, so modifications to the elements of A
will be reflected in B. If an independent copy
is required, then B = A.copy() can be used. Note
that this facilitates returning arrays from functions
without relying on compiler optimizations to eliminate
extensive data copying.
<p>
The indexing and layout of this array object makes
it compatible with C and C++ algorithms that utilize
the familiar C[i][j] notation. This includes numerous
textbooks, such as Numercial Recipes, and various
public domain codes.
*/
template <class T>
class Array2D
{
private:
Array1D<T> data_;
Array1D<T*> v_;
int m_;
int n_;
public:
/**
Used to determined the data type of array entries. This is most
commonly used when requiring scalar temporaries in templated algorithms
that have TNT arrays as input. For example,
<pre>
template &lt class ArrayTwoD &gt
void foo(ArrayTwoD &A)
{
A::value_type first_entry = A[0][0];
...
}
</pre>
*/
typedef T value_type;
/**
Create a null array. This is <b>not</b> the same
as Array2D(0,0), which consumes some memory overhead.
*/
Array2D();
/**
Create a new (m x n) array, without initalizing elements. (This
encurs an O(1) operation cost, rather than a O(m*n) cost.)
@param m the first (row) dimension of the new matrix.
@param n the second (column) dimension of the new matrix.
*/
Array2D(int m, int n);
/**
Create a new (m x n) array, as a view of an existing one-dimensional
array stored in row-major order, i.e. right-most dimension varying fastest.
Note that the storage for this pre-existing array will
never be destroyed by TNT.
@param m the first (row) dimension of the new matrix.
@param n the second (column) dimension of the new matrix.
@param a the one dimensional C array to use as data storage for
the array.
*/
Array2D(int m, int n, T *a);
/**
Create a new (m x n) array, initializing array elements to
constant specified by argument. Most often used to
create an array of zeros, as in A(m, n, 0.0).
@param m the first (row) dimension of the new matrix.
@param n the second (column) dimension of the new matrix.
@param val the constant value to set all elements of the new array to.
*/
Array2D(int m, int n, const T &val);
/**
Copy constructor. Array data is NOT copied, but shared.
Thus, in Array2D B(A), subsequent changes to A will
be reflected in B. For an indepent copy of A, use
Array2D B(A.copy()), or B = A.copy(), instead.
*/
inline Array2D(const Array2D &A);
/**
Convert 2D array into a regular multidimensional C pointer. Most often
called automatically when calling C interfaces that expect things like
double** rather than Array2D<dobule>.
*/
inline operator T**();
/**
Convert a const 2D array into a const multidimensional C pointer.
Most often called automatically when calling C interfaces that expect
things like "const double**" rather than "const Array2D<dobule>&".
*/
inline operator const T**() const;
/**
Assign all elements of array the same value.
@param val the value to assign each element.
*/
inline Array2D & operator=(const T &val);
/**
Assign one Array2D to another. (This is a shallow-assignement operation,
and it is the identical semantics to ref(A).
@param A the array to assign this one to.
*/
inline Array2D & operator=(const Array2D &A);
inline Array2D & ref(const Array2D &A);
Array2D copy() const;
Array2D & inject(const Array2D & A);
inline T* operator[](int i);
inline const T* operator[](int i) const;
inline int dim1() const;
inline int dim2() const;
~Array2D();
/* extended interface (not part of the standard) */
inline int ref_count();
inline int ref_count_data();
inline int ref_count_dim1();
Array2D subarray(int i0, int i1, int j0, int j1);
};
/**
Create a new (m x n) array, WIHOUT initializing array elements.
To create an initialized array of constants, see Array2D(m,n,value).
<p>
This version avoids the O(m*n) initialization overhead and
is used just before manual assignment.
@param m the first (row) dimension of the new matrix.
@param n the second (column) dimension of the new matrix.
*/
template <class T>
Array2D<T>::Array2D() : data_(), v_(), m_(0), n_(0) {}
template <class T>
Array2D<T>::Array2D(const Array2D<T> &A) : data_(A.data_), v_(A.v_),
m_(A.m_), n_(A.n_) {}
template <class T>
Array2D<T>::Array2D(int m, int n) : data_(m*n), v_(m), m_(m), n_(n)
{
if (m>0 && n>0)
{
T* p = &(data_[0]);
for (int i=0; i<m; i++)
{
v_[i] = p;
p += n;
}
}
}
template <class T>
Array2D<T>::Array2D(int m, int n, const T &val) : data_(m*n), v_(m),
m_(m), n_(n)
{
if (m>0 && n>0)
{
data_ = val;
T* p = &(data_[0]);
for (int i=0; i<m; i++)
{
v_[i] = p;
p += n;
}
}
}
template <class T>
Array2D<T>::Array2D(int m, int n, T *a) : data_(m*n, a), v_(m), m_(m), n_(n)
{
if (m>0 && n>0)
{
T* p = &(data_[0]);
for (int i=0; i<m; i++)
{
v_[i] = p;
p += n;
}
}
}
template <class T>
inline T* Array2D<T>::operator[](int i)
{
#ifdef TNT_BOUNDS_CHECK
assert(i >= 0);
assert(i < m_);
#endif
return v_[i];
}
template <class T>
inline const T* Array2D<T>::operator[](int i) const
{
#ifdef TNT_BOUNDS_CHECK
assert(i >= 0);
assert(i < m_);
#endif
return v_[i];
}
template <class T>
Array2D<T> & Array2D<T>::operator=(const T &a)
{
/* non-optimzied, but will work with subarrays in future verions */
for (int i=0; i<m_; i++)
for (int j=0; j<n_; j++)
v_[i][j] = a;
return *this;
}
template <class T>
Array2D<T> Array2D<T>::copy() const
{
Array2D A(m_, n_);
for (int i=0; i<m_; i++)
for (int j=0; j<n_; j++)
A[i][j] = v_[i][j];
return A;
}
template <class T>
Array2D<T> & Array2D<T>::inject(const Array2D &A)
{
if (A.m_ == m_ && A.n_ == n_)
{
for (int i=0; i<m_; i++)
for (int j=0; j<n_; j++)
v_[i][j] = A[i][j];
}
return *this;
}
template <class T>
Array2D<T> & Array2D<T>::ref(const Array2D<T> &A)
{
if (this != &A)
{
v_ = A.v_;
data_ = A.data_;
m_ = A.m_;
n_ = A.n_;
}
return *this;
}
template <class T>
Array2D<T> & Array2D<T>::operator=(const Array2D<T> &A)
{
return ref(A);
}
template <class T>
inline int Array2D<T>::dim1() const { return m_; }
template <class T>
inline int Array2D<T>::dim2() const { return n_; }
template <class T>
Array2D<T>::~Array2D() {}
template <class T>
inline Array2D<T>::operator T**()
{
return &(v_[0]);
}
template <class T>
inline Array2D<T>::operator const T**() const
{
return static_cast<const T**>(&(v_[0]));
}
/* ............... extended interface ............... */
/**
Create a new view to a subarray defined by the boundaries
[i0][i0] and [i1][j1]. The size of the subarray is
(i1-i0) by (j1-j0). If either of these lengths are zero
or negative, the subarray view is null.
*/
template <class T>
Array2D<T> Array2D<T>::subarray(int i0, int i1, int j0, int j1)
{
Array2D<T> A;
int m = i1-i0+1;
int n = j1-j0+1;
/* if either length is zero or negative, this is an invalide
subarray. return a null view.
*/
if (m<1 || n<1)
return A;
A.data_ = data_;
A.m_ = m;
A.n_ = n;
A.v_ = Array1D<T*>(m);
T* p = &(data_[0]) + i0 * n_ + j0;
for (int i=0; i<m; i++)
{
A.v_[i] = p + i*n_;
}
return A;
}
template <class T>
inline int Array2D<T>::ref_count()
{
return ref_count_data();
}
template <class T>
inline int Array2D<T>::ref_count_data()
{
return data_.ref_count();
}
template <class T>
inline int Array2D<T>::ref_count_dim1()
{
return v_.ref_count();
}
} /* namespace TNT */
#endif
/* TNT_ARRAY2D_H */

243
src/Lib/Geometry/TNT/tnt_i_refvec.h Normal file
View file

@ -0,0 +1,243 @@
/*
*
* Template Numerical Toolkit (TNT)
*
* Mathematical and Computational Sciences Division
* National Institute of Technology,
* Gaithersburg, MD USA
*
*
* This software was developed at the National Institute of Standards and
* Technology (NIST) by employees of the Federal Government in the course
* of their official duties. Pursuant to title 17 Section 105 of the
* United States Code, this software is not subject to copyright protection
* and is in the public domain. NIST assumes no responsibility whatsoever for
* its use by other parties, and makes no guarantees, expressed or implied,
* about its quality, reliability, or any other characteristic.
*
*/
#ifndef TNT_I_REFVEC_H
#define TNT_I_REFVEC_H
#include <cstdlib>
#include <iostream>
#ifdef TNT_BOUNDS_CHECK
#include <assert.h>
#endif
#ifndef NULL
#define NULL 0
#endif
namespace TNT
{
/*
Internal representation of ref-counted array. The TNT
arrays all use this building block.
<p>
If an array block is created by TNT, then every time
an assignment is made, the left-hand-side reference
is decreased by one, and the right-hand-side refernce
count is increased by one. If the array block was
external to TNT, the refernce count is a NULL pointer
regardless of how many references are made, since the
memory is not freed by TNT.
*/
template <class T>
class i_refvec
{
private:
T* data_;
int *ref_count_;
public:
i_refvec();
explicit i_refvec(int n);
inline i_refvec(T* data);
inline i_refvec(const i_refvec &v);
inline T* begin();
inline const T* begin() const;
inline T& operator[](int i);
inline const T& operator[](int i) const;
inline i_refvec<T> & operator=(const i_refvec<T> &V);
void copy_(T* p, const T* q, const T* e);
void set_(T* p, const T* b, const T* e);
inline int ref_count() const;
inline int is_null() const;
inline void destroy();
~i_refvec();
};
template <class T>
void i_refvec<T>::copy_(T* p, const T* q, const T* e)
{
for (T* t=p; q<e; t++, q++)
*t= *q;
}
template <class T>
i_refvec<T>::i_refvec() : data_(NULL), ref_count_(NULL) {}
/**
In case n is 0 or negative, it does NOT call new.
*/
template <class T>
i_refvec<T>::i_refvec(int n) : data_(NULL), ref_count_(NULL)
{
if (n >= 1)
{
#ifdef TNT_DEBUG
std::cout << "new data storage.\n";
#endif
data_ = new T[n];
ref_count_ = new int;
*ref_count_ = 1;
}
}
template <class T>
inline i_refvec<T>::i_refvec(const i_refvec<T> &V): data_(V.data_),
ref_count_(V.ref_count_)
{
if (V.ref_count_ != NULL)
(*(V.ref_count_))++;
}
template <class T>
i_refvec<T>::i_refvec(T* data) : data_(data), ref_count_(NULL) {}
template <class T>
inline T* i_refvec<T>::begin()
{
return data_;
}
template <class T>
inline const T& i_refvec<T>::operator[](int i) const
{
return data_[i];
}
template <class T>
inline T& i_refvec<T>::operator[](int i)
{
return data_[i];
}
template <class T>
inline const T* i_refvec<T>::begin() const
{
return data_;
}
template <class T>
i_refvec<T> & i_refvec<T>::operator=(const i_refvec<T> &V)
{
if (this == &V)
return *this;
if (ref_count_ != NULL)
{
(*ref_count_) --;
if ((*ref_count_) == 0)
destroy();
}
data_ = V.data_;
ref_count_ = V.ref_count_;
if (V.ref_count_ != NULL)
(*(V.ref_count_))++;
return *this;
}
template <class T>
void i_refvec<T>::destroy()
{
if (ref_count_ != NULL)
{
#ifdef TNT_DEBUG
std::cout << "destorying data... \n";
#endif
delete ref_count_;
#ifdef TNT_DEBUG
std::cout << "deleted ref_count_ ...\n";
#endif
if (data_ != NULL)
delete []data_;
#ifdef TNT_DEBUG
std::cout << "deleted data_[] ...\n";
#endif
data_ = NULL;
}
}
/*
* return 1 is vector is empty, 0 otherwise
*
* if is_null() is false and ref_count() is 0, then
*
*/
template<class T>
int i_refvec<T>::is_null() const
{
return (data_ == NULL ? 1 : 0);
}
/*
* returns -1 if data is external,
* returns 0 if a is NULL array,
* otherwise returns the positive number of vectors sharing
* this data space.
*/
template <class T>
int i_refvec<T>::ref_count() const
{
if (data_ == NULL)
return 0;
else
return (ref_count_ != NULL ? *ref_count_ : -1) ;
}
template <class T>
i_refvec<T>::~i_refvec()
{
if (ref_count_ != NULL)
{
(*ref_count_)--;
if (*ref_count_ == 0)
destroy();
}
}
} /* namespace TNT */
#endif
/* TNT_I_REFVEC_H */

37
src/Lib/Geometry/TNT/tnt_math_utils.h Normal file
View file

@ -0,0 +1,37 @@
#ifndef MATH_UTILS_H
#define MATH_UTILS_H
/* needed for abs(), sqrt() below */
#include <cmath>
namespace TNT
{
using namespace std;
/**
@returns hypotenuse of real (non-complex) scalars a and b by
avoiding underflow/overflow
using (a * sqrt( 1 + (b/a) * (b/a))), rather than
sqrt(a*a + b*b).
*/
template <class Real>
Real hypot(const Real &a, const Real &b)
{
if (a== 0)
return abs(b);
else
{
Real c = b/a;
return abs(a) * sqrt(1 + c*c);
}
}
} /* TNT namespace */
#endif
/* MATH_UTILS_H */