national_grid 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a63473d5509a197a4561690220a04bd5fcd01ed3
-  data.tar.gz: fdf94e39b6f7a4b96def05be79e8010a0135ed6a
+  metadata.gz: 8f41ecc57f8f9a7908bd0a4c0850bea186060eb1
+  data.tar.gz: 3db89a1bb90c25dd163d8cb3aaca85e5173c6ad9
 SHA512:
-  metadata.gz: 7036cb2156ca35e3b81d48a14968160f936a8481d16f455d3717b51e0c713f4b20ad2280007f6ca716502bb180a0f34a09c0e827c00e565be1b952a2b62c1b60
-  data.tar.gz: 17bdd7ef6e1dbfb352404958c1836b9298c3b36af18165892d08a6fe07e4f26ba079ba1e164c820eab657994c25866179a1bba2d68e6132280248a97e3641527
+  metadata.gz: b4f670c8624ce08e88170b9034625b2b6825a9084670d4743a5be1cfbd03acae012a7d9a9b50ce6730cfec87eca49f1323c1d9e20b2fc028c5509e08b23910d3
+  data.tar.gz: b6ad55bbbf7e5cf61a51af91d3b86ee93ebb6f95d30583b3a35811bc1a43fc2ede6b167bf929575ca16add6de57a0d1ae032567a97f9150a8fbd09911f846396

data/Rakefile

@@ -5,16 +5,10 @@ require_relative "ext/ostn02c"
 
 CLEAN.include OSTN02C.object_path
 
-file OSTN02C.library => OSTN02C.sources do
-  OSTN02C.make or fail "Building libostn02 failed"
-end
-
 Rake::ExtensionTask.new "national_grid" do |ext|
   ext.lib_dir = "lib/national_grid"
 end
 
-Rake::Task["compile"].prerequisites.unshift FileList[OSTN02C.library]
-
 Rake::TestTask.new "test" => "compile" do |test|
   test.pattern = "test/**/*_test.rb"
 end

data/ext/national_grid/extconf.rb

@@ -3,6 +3,8 @@ require_relative "../ostn02c"
 
 dir_config "ostn02c", [OSTN02C.include_path], [OSTN02C.lib_path]
 
+OSTN02C.make or abort "building libostn02 failed"
+
 abort "libostn02 not found" unless have_library "ostn02", "test(false)", "OSTN02.h"
 
 create_makefile "national_grid/national_grid"

data/ext/ostn02c.rb

@@ -12,14 +12,14 @@ module OSTN02C
     puts "Compiling libostn02"
     FileUtils.mkdir_p object_path
     Dir.chdir object_path do
-      system RbConfig.expand("$(CC) -I#{include_path} $(CPPFLAGS) $(CFLAGS) -c #{sources.join(" ")}")
+      run RbConfig.expand("$(CC) -I#{include_path} $(CPPFLAGS) $(CFLAGS) -c #{sources.join(" ")}")
     end
   end
 
   def package
     puts "Packaging libostn02"
     FileUtils.mkdir_p lib_path
-    system RbConfig.expand("$(AR) -crsv #{library} #{objects}")
+    run RbConfig.expand("$(AR) -crsv #{library} #{objects}")
   end
 
   def sources
@@ -49,4 +49,9 @@ module OSTN02C
   def output_path
     File.expand_path("../tmp/ostn02c", __dir__)
   end
+
+  def run(command)
+    puts command
+    system command
+  end
 end

data/ext/ostn02c/.gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+xcuserdata

data/ext/ostn02c/OSTN02.xcodeproj/project.pbxproj

@@ -0,0 +1,280 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		5E2FEDCD14B35558007849B4 /* crc32.c in Sources */ = {isa = PBXBuildFile; fileRef = 5E2FEDCC14B35558007849B4 /* crc32.c */; };
+		5EBE804514A5FE4800CA9D70 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 5EBE804414A5FE4800CA9D70 /* main.c */; };
+		5EBE804F14A5FE9000CA9D70 /* OSTN02.c in Sources */ = {isa = PBXBuildFile; fileRef = 5EBE804E14A5FE9000CA9D70 /* OSTN02.c */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		5EBE803E14A5FE4800CA9D70 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		5E2FEDCC14B35558007849B4 /* crc32.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = crc32.c; sourceTree = "<group>"; };
+		5E2FEDCE14B35570007849B4 /* crc32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crc32.h; sourceTree = "<group>"; };
+		5E2FEDCF14B35DD4007849B4 /* testCoords.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = testCoords.data; sourceTree = "<group>"; };
+		5E2FEDDA14B3641B007849B4 /* geoids.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = geoids.data; sourceTree = "<group>"; };
+		5E2FEDDD14B374AF007849B4 /* README.textile */ = {isa = PBXFileReference; lastKnownFileType = text; path = README.textile; sourceTree = "<group>"; };
+		5E67D47B14B212FE00F5D4BC /* shifts.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shifts.data; sourceTree = "<group>"; };
+		5E67D47C14B212FE00F5D4BC /* shifts.index.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = shifts.index.data; sourceTree = "<group>"; };
+		5E7AD48014B0D26E00AA6C99 /* csv-to-struct-array.rb */ = {isa = PBXFileReference; lastKnownFileType = text.script.ruby; path = "csv-to-struct-array.rb"; sourceTree = "<group>"; };
+		5E7BD21415B99A5F0003C1E5 /* explorerMaps.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = explorerMaps.data; sourceTree = "<group>"; };
+		5E9AFE1214F2525900F82BD7 /* fancyOut.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fancyOut.h; sourceTree = "<group>"; };
+		5E9AFE1414F2560D00F82BD7 /* dblRelated.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = dblRelated.h; sourceTree = "<group>"; };
+		5EB2BE9D14B7593100EE7A5D /* gridRef.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = gridRef.data; sourceTree = "<group>"; };
+		5EBE804014A5FE4800CA9D70 /* ostn02c */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ostn02c; sourceTree = BUILT_PRODUCTS_DIR; };
+		5EBE804414A5FE4800CA9D70 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
+		5EBE804D14A5FE7300CA9D70 /* OSTN02.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSTN02.h; sourceTree = "<group>"; };
+		5EBE804E14A5FE9000CA9D70 /* OSTN02.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = OSTN02.c; sourceTree = "<group>"; };
+		5ECB2EE414B863F00015B28A /* constants.data */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = constants.data; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		5EBE803D14A5FE4800CA9D70 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		5E2FEDDC14B364D6007849B4 /* Data */ = {
+			isa = PBXGroup;
+			children = (
+				5E67D47B14B212FE00F5D4BC /* shifts.data */,
+				5E67D47C14B212FE00F5D4BC /* shifts.index.data */,
+				5E2FEDCF14B35DD4007849B4 /* testCoords.data */,
+				5E2FEDDA14B3641B007849B4 /* geoids.data */,
+				5EB2BE9D14B7593100EE7A5D /* gridRef.data */,
+				5ECB2EE414B863F00015B28A /* constants.data */,
+				5E7BD21415B99A5F0003C1E5 /* explorerMaps.data */,
+			);
+			name = Data;
+			path = OSTN02;
+			sourceTree = "<group>";
+		};
+		5EBE803514A5FE4800CA9D70 = {
+			isa = PBXGroup;
+			children = (
+				5E2FEDDD14B374AF007849B4 /* README.textile */,
+				5E7AD48014B0D26E00AA6C99 /* csv-to-struct-array.rb */,
+				5EBE804314A5FE4800CA9D70 /* Source code */,
+				5E2FEDDC14B364D6007849B4 /* Data */,
+				5EBE804114A5FE4800CA9D70 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		5EBE804114A5FE4800CA9D70 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				5EBE804014A5FE4800CA9D70 /* ostn02c */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		5EBE804314A5FE4800CA9D70 /* Source code */ = {
+			isa = PBXGroup;
+			children = (
+				5EBE804D14A5FE7300CA9D70 /* OSTN02.h */,
+				5EBE804E14A5FE9000CA9D70 /* OSTN02.c */,
+				5E2FEDCC14B35558007849B4 /* crc32.c */,
+				5E2FEDCE14B35570007849B4 /* crc32.h */,
+				5EBE804414A5FE4800CA9D70 /* main.c */,
+				5E9AFE1214F2525900F82BD7 /* fancyOut.h */,
+				5E9AFE1414F2560D00F82BD7 /* dblRelated.h */,
+			);
+			name = "Source code";
+			path = OSTN02;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		5EBE803F14A5FE4800CA9D70 /* OSTN02 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 5EBE804A14A5FE4900CA9D70 /* Build configuration list for PBXNativeTarget "OSTN02" */;
+			buildPhases = (
+				5EBE803C14A5FE4800CA9D70 /* Sources */,
+				5EBE803D14A5FE4800CA9D70 /* Frameworks */,
+				5EBE803E14A5FE4800CA9D70 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = OSTN02;
+			productName = OSTN02;
+			productReference = 5EBE804014A5FE4800CA9D70 /* ostn02c */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		5EBE803714A5FE4800CA9D70 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0430;
+				ORGANIZATIONNAME = "George MacKerron";
+			};
+			buildConfigurationList = 5EBE803A14A5FE4800CA9D70 /* Build configuration list for PBXProject "OSTN02" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5EBE803514A5FE4800CA9D70;
+			productRefGroup = 5EBE804114A5FE4800CA9D70 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				5EBE803F14A5FE4800CA9D70 /* OSTN02 */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		5EBE803C14A5FE4800CA9D70 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				5EBE804514A5FE4800CA9D70 /* main.c in Sources */,
+				5EBE804F14A5FE9000CA9D70 /* OSTN02.c in Sources */,
+				5E2FEDCD14B35558007849B4 /* crc32.c in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		5EBE804814A5FE4800CA9D70 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_PARAMETER = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		5EBE804914A5FE4800CA9D70 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+				CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = YES;
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_ENABLE_OBJC_EXCEPTIONS = NO;
+				GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES;
+				GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES;
+				GCC_WARN_SHADOW = YES;
+				GCC_WARN_SIGN_COMPARE = YES;
+				GCC_WARN_UNKNOWN_PRAGMAS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_PARAMETER = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.4;
+				RUN_CLANG_STATIC_ANALYZER = YES;
+				SDKROOT = macosx;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		5EBE804B14A5FE4900CA9D70 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SDKROOT)/usr/lib/system\"",
+				);
+				PRODUCT_NAME = ostn02c;
+			};
+			name = Debug;
+		};
+		5EBE804C14A5FE4900CA9D70 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				LIBRARY_SEARCH_PATHS = (
+					"$(inherited)",
+					"\"$(SDKROOT)/usr/lib/system\"",
+				);
+				PRODUCT_NAME = ostn02c;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		5EBE803A14A5FE4800CA9D70 /* Build configuration list for PBXProject "OSTN02" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5EBE804814A5FE4800CA9D70 /* Debug */,
+				5EBE804914A5FE4800CA9D70 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		5EBE804A14A5FE4900CA9D70 /* Build configuration list for PBXNativeTarget "OSTN02" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				5EBE804B14A5FE4900CA9D70 /* Debug */,
+				5EBE804C14A5FE4900CA9D70 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 5EBE803714A5FE4800CA9D70 /* Project object */;
+}

data/ext/ostn02c/OSTN02.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:OSTN02.xcodeproj">
+   </FileRef>
+</Workspace>

data/ext/ostn02c/OSTN02/OSTN02.c

@@ -0,0 +1,510 @@
+//
+//  OSTN02.c
+//  OSTN02
+//
+//  Created by George MacKerron on 24/12/2011.
+//  Copyright (c) 2011 George MacKerron. All rights reserved.
+//
+
+#include "OSTN02.h"
+#include "dblRelated.h"
+#include "crc32.h"
+#include "fancyOut.h"
+#include "constants.data"
+#include "shifts.index.data"
+#include "shifts.data"
+#include "geoids.data"
+#include "gridRef.data"
+#include "testCoords.data"
+#include "explorerMaps.data"
+
+#define LENGTH_OF(x) (sizeof (x) / sizeof *(x))
+#define ASPRINTF_OR_DIE(...) if (asprintf(__VA_ARGS__) < 0) exit(EXIT_FAILURE)
+
+#define originalIndicesCRC 244629328L  // these won't be robust against differing endianness or compiler packing of bit-structs
+#define originalDataCRC    790474494L
+
+static CDBL piOver180       = L(0.017453292519943295769236907684886127134428718885417254560971914401710091146034494436822415696345094822);
+static CDBL oneEightyOverPi = L(57.29577951308232087679815481410517033240547246656432154916024386120284714832155263244096899585111094418);
+
+
+DBL gridConvergenceDegreesFromLatLon(const LatLonDecimal latLon, const Ellipsoid ellipsoid, const MapProjection projection) {
+  
+  CDBL phi     = piOver180 * latLon.lat;
+  CDBL lambda  = piOver180 * latLon.lon;
+  CDBL lambda0 = piOver180 * projection.trueOriginLatLon.lon;
+  
+  CDBL a   = ellipsoid.semiMajorAxis;
+  CDBL b   = ellipsoid.semiMinorAxis;
+  CDBL f0  = projection.centralMeridianScale;
+  
+  CDBL deltaLambda  = lambda - lambda0;
+  CDBL deltaLambda2 = deltaLambda  * deltaLambda;
+  CDBL deltaLambda3 = deltaLambda2 * deltaLambda;
+  CDBL deltaLambda5 = deltaLambda3 * deltaLambda2;
+  
+  CDBL sinPhi   = SIN(phi);
+  CDBL sinPhi2  = sinPhi * sinPhi;
+  CDBL cosPhi   = COS(phi);
+  CDBL cosPhi2  = cosPhi * cosPhi;
+  CDBL cosPhi4  = cosPhi2 * cosPhi2;
+  CDBL tanPhi   = TAN(phi);
+  CDBL tanPhi2  = tanPhi * tanPhi;
+  
+  CDBL af0  = a * f0;
+  CDBL af02 = af0 * af0;
+  CDBL bf0  = b * f0;
+  CDBL bf02 = bf0 * bf0;
+  
+  CDBL e2    = (af02 - bf02) / af02;
+  CDBL nu    = af0 / SQRT(L(1.0) - (e2 * sinPhi2));
+  CDBL rho   = (nu * (L(1.0) - e2)) / (L(1.0) - (e2 * sinPhi2));
+  CDBL eta2  = (nu / rho) - L(1.0);
+  CDBL xiv   = ((sinPhi * cosPhi2) / L(3.0))  * (L(1.0) + L(3.0) * eta2 + L(2.0) * eta2 * eta2);
+  CDBL xv    = ((sinPhi * cosPhi4) / L(15.0)) * (L(2.0) - tanPhi2);
+  
+  CDBL cRads = (deltaLambda * sinPhi) + (deltaLambda3 * xiv) + (deltaLambda5 * xv);
+  return oneEightyOverPi * cRads;
+}
+
+
+DBL gridConvergenceDegreesFromEastingNorthing(const EastingNorthing en, const Ellipsoid ellipsoid, const MapProjection projection) {
+  
+  LatLonDecimal latLon = latLonFromEastingNorthing(en, ellipsoid, projection);
+  CDBL phi     = piOver180 * latLon.lat;
+  CDBL lambda  = piOver180 * latLon.lon;
+  CDBL lambda0 = piOver180 * projection.trueOriginLatLon.lon;
+  
+  CDBL a   = ellipsoid.semiMajorAxis;
+  CDBL b   = ellipsoid.semiMinorAxis;
+  CDBL f0  = projection.centralMeridianScale;
+  
+  CDBL deltaLambda  = lambda - lambda0;
+  CDBL deltaLambda2 = deltaLambda  * deltaLambda;
+  CDBL deltaLambda3 = deltaLambda2 * deltaLambda;
+  CDBL deltaLambda5 = deltaLambda3 * deltaLambda2;
+  
+  CDBL sinPhi   = SIN(phi);
+  CDBL sinPhi2  = sinPhi * sinPhi;
+  CDBL cosPhi   = COS(phi);
+  CDBL cosPhi2  = cosPhi * cosPhi;
+  CDBL cosPhi4  = cosPhi2 * cosPhi2;
+  CDBL tanPhi   = TAN(phi);
+  CDBL tanPhi2  = tanPhi * tanPhi;
+  
+  CDBL af0  = a * f0;
+  CDBL af02 = af0 * af0;
+  CDBL bf0  = b * f0;
+  CDBL bf02 = bf0 * bf0;
+  
+  CDBL e2    = (af02 - bf02) / af02;
+  CDBL nu    = af0 / SQRT(L(1.0) - (e2 * sinPhi2));
+  CDBL rho   = (nu * (L(1.0) - e2)) / (L(1.0) - (e2 * sinPhi2));
+  CDBL eta2  = (nu / rho) - L(1.0);
+  CDBL xiv   = ((sinPhi * cosPhi2) / L(3.0))  * (L(1.0) + L(3.0) * eta2 + L(2.0) * eta2 * eta2);
+  CDBL xv    = ((sinPhi * cosPhi4) / L(15.0)) * (L(2.0) - tanPhi2);
+  
+  CDBL cRads = (deltaLambda * sinPhi) + (deltaLambda3 * xiv) + (deltaLambda5 * xv);
+  return oneEightyOverPi * cRads;
+}
+
+int nextOSExplorerMap(EastingNorthing en, int prevMap) {
+  for (int i = prevMap + 1, len = LENGTH_OF(OSExplorerMaps); i < len; i ++) {
+    OSMap map = OSExplorerMaps[i];
+    if (   en.e >= (DBL) map.emin 
+        && en.e <= (DBL) map.emax 
+        && en.n >= (DBL) map.nmin 
+        && en.n <= (DBL) map.nmax) return i;
+  }
+  return -1;
+}
+
+EastingNorthing eastingNorthingFromLatLon(const LatLonDecimal latLon, const Ellipsoid ellipsoid, const MapProjection projection) {
+  CDBL a   = ellipsoid.semiMajorAxis;
+  CDBL b   = ellipsoid.semiMinorAxis;
+  CDBL f0  = projection.centralMeridianScale;
+  CDBL e0  = projection.trueOriginEastingNorthing.e;
+  CDBL n0  = projection.trueOriginEastingNorthing.n;
+  
+  CDBL phi     = piOver180 * latLon.lat;
+  CDBL lambda  = piOver180 * latLon.lon;
+  CDBL phi0    = piOver180 * projection.trueOriginLatLon.lat;
+  CDBL lambda0 = piOver180 * projection.trueOriginLatLon.lon;
+  
+  CDBL deltaPhi = phi - phi0;
+  CDBL sumPhi   = phi + phi0;
+  CDBL sinPhi   = SIN(phi);
+  CDBL sinPhi2  = sinPhi * sinPhi;
+  CDBL cosPhi   = COS(phi);
+  CDBL cosPhi2  = cosPhi * cosPhi;
+  CDBL cosPhi3  = cosPhi2 * cosPhi;
+  CDBL cosPhi5  = cosPhi3 * cosPhi2;
+  CDBL tanPhi   = TAN(phi);
+  CDBL tanPhi2  = tanPhi * tanPhi;
+  CDBL tanPhi4  = tanPhi2 * tanPhi2;
+  
+  CDBL a2   = a * a;
+  CDBL e2   = (a2 - b * b) / a2;
+  CDBL n    = (a - b) / (a + b);
+  CDBL n2   = n * n;
+  CDBL n3   = n2 * n;
+  CDBL oneMinusE2SinPhi2 = L(1.0) - e2 * sinPhi2;
+  CDBL sqrtOneMinusE2SinPhi2 = SQRT(oneMinusE2SinPhi2);
+  CDBL v    = a * f0 / sqrtOneMinusE2SinPhi2;
+  CDBL rho  = a * f0 * (L(1.0) - e2) / (oneMinusE2SinPhi2 * sqrtOneMinusE2SinPhi2);
+  CDBL eta2 = v / rho - L(1.0);
+  CDBL m    = b * f0 * ( (L(1.0) + n + (L(5.0) / L(4.0)) * n2 + (L(5.0) / L(4.0)) * n3) * deltaPhi
+                       - (L(3.0) * n + L(3.0) * n2 + (L(21.0) / L(8.0)) * n3) * SIN(deltaPhi) * COS(sumPhi)
+                       + ((L(15.0) / L(8.0)) * n2 + (L(15.0) / L(8.0)) * n3) * SIN(L(2.0) * deltaPhi) * COS(L(2.0) * sumPhi)
+                       - (L(35.0) / L(24.0)) * n3 * SIN(L(3.0) * deltaPhi) * COS(L(3.0) * sumPhi) 
+                       );
+  
+  CDBL one    = m + n0;
+  CDBL two    = (v /   L(2.0)) * sinPhi * cosPhi;
+  CDBL three  = (v /  L(24.0)) * sinPhi * cosPhi3 * (L(5.0) - tanPhi2 + L(9.0) * eta2);
+  CDBL threeA = (v / L(720.0)) * sinPhi * cosPhi5 * (L(61.0) - L(58.0) * tanPhi2 + tanPhi4);
+  CDBL four   = v * cosPhi;
+  CDBL five   = (v /   L(6.0)) * cosPhi3 * (v / rho - tanPhi2);
+  CDBL six    = (v / L(120.0)) * cosPhi5 * (L(5.0) - L(18.0) * tanPhi2 + tanPhi4 + L(14.0) * eta2 - L(58.0) * tanPhi2 * eta2);
+  
+  CDBL deltaLambda  = lambda - lambda0;
+  CDBL deltaLambda2 = deltaLambda  * deltaLambda;
+  CDBL deltaLambda3 = deltaLambda2 * deltaLambda;
+  CDBL deltaLambda4 = deltaLambda3 * deltaLambda;
+  CDBL deltaLambda5 = deltaLambda4 * deltaLambda;
+  CDBL deltaLambda6 = deltaLambda5 * deltaLambda;
+  
+  EastingNorthing en;
+  en.n = one + two * deltaLambda2 + three * deltaLambda4 + threeA * deltaLambda6;
+  en.e = e0 + four * deltaLambda + five * deltaLambda3 + six * deltaLambda5;
+  en.elevation = latLon.elevation;
+  en.geoid = latLon.geoid;
+  
+  return en;
+}
+
+EastingNorthing ETRS89EastingNorthingFromETRS89LatLon(const LatLonDecimal latLon) {
+  return eastingNorthingFromLatLon(latLon, GRS80Ellipsoid, NationalGridProj);
+}
+
+LatLonDecimal latLonFromEastingNorthing(const EastingNorthing en, const Ellipsoid ellipsoid, const MapProjection projection) {
+  CDBL a   = ellipsoid.semiMajorAxis;
+  CDBL b   = ellipsoid.semiMinorAxis;
+  CDBL f0  = projection.centralMeridianScale;
+  CDBL e0  = projection.trueOriginEastingNorthing.e;
+  CDBL n0  = projection.trueOriginEastingNorthing.n;
+  CDBL n   = (a - b) / (a + b);
+  CDBL n2  = n * n;
+  CDBL n3  = n2 * n;
+  CDBL bf0 = b * f0;
+  
+  CDBL phi0    = piOver180 * projection.trueOriginLatLon.lat;
+  CDBL lambda0 = piOver180 * projection.trueOriginLatLon.lon;
+  
+  DBL phi = phi0;  // this is phi' in the OS docs
+  DBL m = L(0.0);
+  DBL deltaPhi, sumPhi;
+  do {
+    phi      = (en.n - n0 - m) / (a * f0) + phi;
+    deltaPhi = phi - phi0;
+    sumPhi   = phi + phi0;
+    m        = bf0 * ( (L(1.0) + n + (L(5.0) / L(4.0)) * n2 + (L(5.0) / L(4.0)) * n3) * deltaPhi
+                     - (L(3.0) * n + L(3.0) * n2 + (L(21.0) / L(8.0)) * n3) * SIN(deltaPhi) * COS(sumPhi)
+                     + ((L(15.0) / L(8.0)) * n2 + (L(15.0) / L(8.0)) * n3) * SIN(L(2.0) * deltaPhi) * COS(L(2.0) * sumPhi)
+                     - (L(35.0) / L(24.0)) * n3 * SIN(L(3.0) * deltaPhi) * COS(L(3.0) * sumPhi)
+                     );
+  } while (ABS(en.n - n0 - m) >= L(0.00001));
+  
+  CDBL sinPhi   = SIN(phi);
+  CDBL sinPhi2  = sinPhi * sinPhi;
+  CDBL cosPhi   = COS(phi);
+  CDBL secPhi   = L(1.0) / cosPhi;
+  CDBL tanPhi   = TAN(phi);
+  CDBL tanPhi2  = tanPhi * tanPhi;
+  CDBL tanPhi4  = tanPhi2 * tanPhi2;
+  CDBL tanPhi6  = tanPhi4 * tanPhi2;
+  
+  CDBL a2   = a * a;
+  CDBL e2   = (a2 - b * b) / a2;
+  CDBL oneMinusE2SinPhi2 = L(1.0) - e2 * sinPhi2;
+  CDBL sqrtOneMinusE2SinPhi2 = SQRT(oneMinusE2SinPhi2);
+  CDBL v    = a * f0 / sqrtOneMinusE2SinPhi2;
+  CDBL rho  = a * f0 * (L(1.0) - e2) / (oneMinusE2SinPhi2 * sqrtOneMinusE2SinPhi2);
+  CDBL eta2 = v / rho - L(1.0);
+  
+  CDBL v2 = v  * v;
+  CDBL v3 = v2 * v;
+  CDBL v5 = v3 * v2;
+  CDBL v7 = v5 * v2;
+  
+  CDBL seven   = tanPhi / (L(2.0) * rho * v);
+  CDBL eight   = (tanPhi * (L(5.0) + L(3.0) * tanPhi2 + eta2 - L(9.0) * tanPhi2 * eta2)) / (L(24.0) * rho * v3);
+  CDBL nine    = (tanPhi * (L(61.0) + L(90.0) * tanPhi2 + L(45.0) * tanPhi4)) / (L(720.0) * rho * v5);
+  CDBL ten     = secPhi / v;
+  CDBL eleven  = (secPhi * ((v / rho) + L(2.0) * tanPhi2)) / (L(6.0) * v3);
+  CDBL twelve  = (secPhi * (L(5.0) + L(28.0) * tanPhi2 + L(24.0) * tanPhi4)) / (L(120.0) * v5);
+  CDBL twelveA = (secPhi * (L(61.0) + L(662.0) * tanPhi2 + L(1320.0) * tanPhi4 + L(720.0) * tanPhi6)) / (L(5040.0) * v7);
+  
+  CDBL deltaE  = en.e - e0;
+  CDBL deltaE2 = deltaE  * deltaE;
+  CDBL deltaE3 = deltaE2 * deltaE;
+  CDBL deltaE4 = deltaE2 * deltaE2;
+  CDBL deltaE5 = deltaE3 * deltaE2;
+  CDBL deltaE6 = deltaE3 * deltaE3;
+  CDBL deltaE7 = deltaE4 * deltaE3;
+  
+  LatLonDecimal latLon;
+  latLon.lat = oneEightyOverPi * (phi - seven * deltaE2 + eight * deltaE4 - nine * deltaE6);
+  latLon.lon = oneEightyOverPi * (lambda0 + ten * deltaE - eleven * deltaE3 + twelve * deltaE5 - twelveA * deltaE7);
+  latLon.elevation = en.elevation;
+  latLon.geoid = en.geoid;
+  
+  return latLon;
+}
+
+LatLonDecimal ETRS89LatLonFromETRS89EastingNorthing(const EastingNorthing en) {
+  return latLonFromEastingNorthing(en, GRS80Ellipsoid, NationalGridProj);
+}
+
+EastingNorthing OSTN02ShiftsForIndices(const int eIndex, const int nIndex) {
+  EastingNorthing shifts;
+  shifts.e = shifts.n = shifts.elevation = shifts.geoid = 0;
+  if (nIndex < 0 || nIndex > 1250) return shifts;
+
+  const OSTN02Index dataIndex = OSTN02Indices[nIndex];
+  if (eIndex < dataIndex.eMin || eIndex >= dataIndex.eMin + dataIndex.eCount) return shifts;
+  
+  const unsigned int dataOffset = dataIndex.offset + (eIndex - dataIndex.eMin);
+  const OSTN02Datum record = OSTN02Data[dataOffset];
+  if (record.gFlag == 0) return shifts;
+  
+  shifts.e         = (((DBL) record.eShift) / L(1000.0)) + L(86.0);
+  shifts.n         = (((DBL) record.nShift) / L(1000.0)) - L(82.0);
+  shifts.elevation = (((DBL) record.gShift) / L(1000.0)) + L(43.0);
+  shifts.geoid     = record.gFlag;
+  return shifts;
+}
+
+EastingNorthing shiftsForEastingNorthing(const EastingNorthing en) {
+  EastingNorthing shifts;
+  shifts.e = shifts.n = shifts.elevation = shifts.geoid = 0;
+  
+  const int e0 = (int) (en.e / L(1000.0));
+  const int n0 = (int) (en.n / L(1000.0));
+  CDBL      dx = en.e - (DBL) (e0 * 1000);
+  CDBL      dy = en.n - (DBL) (n0 * 1000);
+  CDBL      t  = dx / L(1000.0);
+  CDBL      u  = dy / L(1000.0);
+  
+  const EastingNorthing shifts0 = OSTN02ShiftsForIndices(e0    , n0    );
+  if (shifts0.geoid == 0) return shifts;
+  
+  const EastingNorthing shifts1 = OSTN02ShiftsForIndices(e0 + 1, n0    );
+  if (shifts1.geoid == 0) return shifts;
+  
+  const EastingNorthing shifts2 = OSTN02ShiftsForIndices(e0 + 1, n0 + 1);
+  if (shifts2.geoid == 0) return shifts;
+  
+  const EastingNorthing shifts3 = OSTN02ShiftsForIndices(e0    , n0 + 1);
+  if (shifts3.geoid == 0) return shifts;
+  
+  CDBL weight0 = (L(1.0) - t) * (L(1.0) - u);
+  CDBL weight1 =           t  * (L(1.0) - u);
+  CDBL weight2 =           t  *           u;
+  CDBL weight3 = (L(1.0) - t) *           u;
+  
+  shifts.e         = weight0 * shifts0.e
+                   + weight1 * shifts1.e 
+                   + weight2 * shifts2.e 
+                   + weight3 * shifts3.e;
+  
+  shifts.n         = weight0 * shifts0.n 
+                   + weight1 * shifts1.n
+                   + weight2 * shifts2.n 
+                   + weight3 * shifts3.n;
+  
+  shifts.elevation = weight0 * shifts0.elevation 
+                   + weight1 * shifts1.elevation
+                   + weight2 * shifts2.elevation
+                   + weight3 * shifts3.elevation;
+  
+  const bool left   = dx < L(500.0);
+  const bool bottom = dy < L(500.0);
+  const EastingNorthing nearestShift = left ? (bottom ? shifts0 : shifts3) : (bottom ? shifts1 : shifts2);
+  shifts.geoid = nearestShift.geoid;
+  
+  return shifts;
+}
+
+EastingNorthing OSGB36EastingNorthingFromETRS89EastingNorthing(const EastingNorthing en) {
+  EastingNorthing shifts = shiftsForEastingNorthing(en);
+  if (shifts.geoid == 0) return shifts;
+  
+  EastingNorthing shifted;
+  shifted.e = en.e + shifts.e;
+  shifted.n = en.n + shifts.n;
+  shifted.elevation = en.elevation - shifts.elevation;
+  shifted.geoid = shifts.geoid;
+  
+  return shifted;
+}
+
+EastingNorthing ETRS89EastingNorthingFromOSGB36EastingNorthing(const EastingNorthing en) {
+  EastingNorthing shifts, prevShifts, shifted;
+  shifts.e = shifts.n = shifted.elevation = shifted.geoid = 0;  // initialising .elevation and .geoid just avoids warnings
+  do {
+    prevShifts.e = shifts.e;
+    prevShifts.n = shifts.n;
+    shifted.e = en.e - shifts.e;
+    shifted.n = en.n - shifts.n;
+    shifts = shiftsForEastingNorthing(shifted);
+    if (shifts.geoid == 0) return shifts;
+  } while (ABS(shifts.e - prevShifts.e) > L(0.0001) || ABS(shifts.n - prevShifts.n) > L(0.0001));
+  
+  shifted.elevation = en.elevation + shifts.elevation;
+  shifted.geoid = shifts.geoid;  // tells us which geoid datum was used in conversion
+  return shifted;
+}
+
+char *gridRefFromOSGB36EastingNorthing(const EastingNorthing en, const bool spaces, const int res) { 
+  // res is expressed in metres: 1/10/100 -> 3/4/5-digit easting and northing
+  const int  eRound = (int) round(en.e / (DBL) res) * res;
+  const int  nRound = (int) round(en.n / (DBL) res) * res;
+  const int  firstEIndex  = eRound / 500000;
+  const int  firstNIndex  = nRound / 500000;
+  const int  secondEIndex = (eRound % 500000) / 100000;
+  const int  secondNIndex = (nRound % 500000) / 100000;
+  const char sq0 = firstLetters[firstNIndex][firstEIndex];
+  const char sq1 = secondLetters[secondNIndex][secondEIndex];
+  const int  e   = eRound - (500000 * firstEIndex) - (100000 * secondEIndex);
+  const int  n   = nRound - (500000 * firstNIndex) - (100000 * secondNIndex);
+  char *ref, *fmtStr;
+  const int digits = res == 100 ? 3 : (res == 10 ? 4 : 5);
+  ASPRINTF_OR_DIE(&fmtStr, "%%c%%c%%s%%0%dd%%s%%0%dd", digits, digits);
+  ASPRINTF_OR_DIE(&ref, fmtStr, sq0, sq1, (spaces ? " " : ""), e / res, (spaces ? " " : ""), n / res);
+  free(fmtStr);
+  return ref;
+}
+
+char *tetradFromOSGB36EastingNorthing(const EastingNorthing en) {
+  // see http://www.bto.org/volunteer-surveys/birdatlas/taking-part/correct-grid-references/know-your-place
+  const int  eTrunc = (int) en.e;  // note: unlike for a grid ref, we never round -- we (implictly) truncate
+  const int  nTrunc = (int) en.n;
+  const int  firstEIndex  = eTrunc / 500000;
+  const int  firstNIndex  = nTrunc / 500000;
+  const int  secondEIndex = (eTrunc % 500000) / 100000;
+  const int  secondNIndex = (nTrunc % 500000) / 100000;
+  const char sq0 = firstLetters[firstNIndex][firstEIndex];
+  const char sq1 = secondLetters[secondNIndex][secondEIndex];
+  const int  eMinusSq = eTrunc - (500000 * firstEIndex) - (100000 * secondEIndex);
+  const int  nMinusSq = nTrunc - (500000 * firstNIndex) - (100000 * secondNIndex);
+  const int  eDigit = eMinusSq / 10000;
+  const int  nDigit = nMinusSq / 10000;
+  const int  tetradEIndex = (eMinusSq % 10000) / 2000;
+  const int  tetradNIndex = (nMinusSq % 10000) / 2000;
+  char tetradLetter = tetradLetters[tetradNIndex][tetradEIndex];
+  char *tetrad;
+  ASPRINTF_OR_DIE(&tetrad, "%c%c%d%d%c", sq0, sq1, eDigit, nDigit, tetradLetter);
+  return tetrad;
+}
+
+LatLonDecimal latLonDecimalFromLatLonDegMinSec(const LatLonDegMinSec dms) {
+  LatLonDecimal dec;
+  dec.lat = (dms.lat.westOrSouth ? L(-1.0) : L(1.0)) * (((DBL) dms.lat.deg) + ((DBL) dms.lat.min) / L(60.0) + dms.lat.sec / L(3600.0));
+  dec.lon = (dms.lon.westOrSouth ? L(-1.0) : L(1.0)) * (((DBL) dms.lon.deg) + ((DBL) dms.lon.min) / L(60.0) + dms.lon.sec / L(3600.0));
+  dec.elevation = dms.elevation;
+  dec.geoid = 0;
+  return dec;
+}
+
+bool test(const bool noisily) {
+  short numTested = 0;
+  short numPassed = 0;
+  bool  testPassed;
+  
+  // check data integrity
+  
+  const unsigned long dataCRC = crc32((unsigned char *) OSTN02Data, sizeof(OSTN02Data));
+  testPassed = dataCRC == originalDataCRC;
+  numTested ++;
+  if (testPassed) numPassed ++;
+  if (noisily) {
+    printf("\nOriginal CRC32 (data):  %li\n", originalDataCRC);
+    printf("%sComputed CRC32 (data):  %li%s\n\n", (testPassed ? "" : BOLD), dataCRC, (testPassed ? "" : UNBOLD));
+  }
+  
+  const unsigned long indicesCRC = crc32((unsigned char *) OSTN02Indices, sizeof(OSTN02Indices));
+  testPassed = indicesCRC == originalIndicesCRC;
+  numTested ++;
+  if (testPassed) numPassed ++;
+  if (noisily) {
+    printf("Original CRC32 (index): %li\n", originalIndicesCRC);
+    printf("%sComputed CRC32 (index): %li%s\n\n", (testPassed ? "" : BOLD), indicesCRC, (testPassed ? "" : UNBOLD));
+  }
+  
+  // check test conversions against known good results
+  
+  LatLonDecimal actualLatLon, computedLatLon;
+  EastingNorthing actualEN, computedEN;
+  char *actualLatLonStr, *computedLatLonStr, *actualENStr, *computedENStr;
+  
+  const int len = LENGTH_OF(testETRSCoords);
+  for (int i = 0; i < len; i ++) {
+    
+    // actual coords
+    
+    actualLatLon = latLonDecimalFromLatLonDegMinSec(testETRSCoords[i]);
+    actualEN     = testOSGB36Coords[i];
+    
+    ASPRINTF_OR_DIE(&actualLatLonStr, LLFMT, actualLatLon.lat, actualLatLon.lon, actualLatLon.elevation);
+    ASPRINTF_OR_DIE(&actualENStr,     ENFMT, actualEN.e,       actualEN.n,       actualEN.elevation, OSGB36GeoidRegions[actualEN.geoid], OSGB36GeoidNames[actualEN.geoid]);
+    
+    if (noisily) {
+      printf("ETRS89 actual   %s\n",   actualLatLonStr);
+      printf("OSGB36 actual   %s\n",   actualENStr);
+    }
+    
+    // computed coords
+    
+    computedLatLon = ETRS89LatLonFromETRS89EastingNorthing(ETRS89EastingNorthingFromOSGB36EastingNorthing(actualEN));
+    computedEN     = OSGB36EastingNorthingFromETRS89EastingNorthing(ETRS89EastingNorthingFromETRS89LatLon(actualLatLon));
+    
+    ASPRINTF_OR_DIE(&computedLatLonStr, LLFMT, computedLatLon.lat, computedLatLon.lon, computedLatLon.elevation);
+    ASPRINTF_OR_DIE(&computedENStr,     ENFMT, computedEN.e,       computedEN.n,       computedEN.elevation, OSGB36GeoidRegions[computedEN.geoid], OSGB36GeoidNames[computedEN.geoid]);
+    
+    if (actualEN.geoid != 0) {  // i.e. these coordinates are not zeroes, and can be converted sensibly
+      testPassed = strcmp(actualLatLonStr, computedLatLonStr) == 0;
+      numTested ++;
+      if (testPassed) numPassed ++;
+      if (noisily) printf("%sETRS89 computed %s\n%s", (testPassed ? "" : BOLD), computedLatLonStr, (testPassed ? "" : UNBOLD));
+    }
+    
+    testPassed = strcmp(actualENStr, computedENStr) == 0;
+    numTested ++;
+    if (testPassed) numPassed ++;
+    if (noisily) printf("%sOSGB36 computed %s\n\n%s", (testPassed ? "" : BOLD), computedENStr, (testPassed ? "" : UNBOLD));
+    
+    free(actualLatLonStr);
+    free(computedLatLonStr);
+    free(actualENStr);
+    free(computedENStr);
+  }
+  
+  /*
+  EastingNorthing testEN;
+  testEN.e = 651409.903;
+  testEN.n = 313177.270;
+  printf("Convergence: %13.11lf \n\n", gridConvergenceDegreesFromEastingNorthing(testEN, Airy1830Ellipsoid, NationalGridProj));
+  */
+  
+  /*
+  LatLonDecimal testLL;
+  testLL.lat = 51.0;
+  testLL.lon = -2.0;
+  printf("Convergence: %13.11lf \n\n", gridConvergenceDegreesFromLatLon(testLL, Airy1830Ellipsoid, NationalGridProj));
+  */
+  
+  bool allPassed = numTested == numPassed;
+  if (noisily) printf("%i tests; %i passed; %s%i failed%s\n\n", numTested, numPassed, (allPassed ? "" : BOLD), numTested - numPassed, (allPassed ? "" : UNBOLD));
+  return allPassed;
+}