updated Biarc

ebertolazzi · Oct 29, 2018 · 33432d3 · 33432d3
1 parent f9a1e45
commit 33432d3
Show file tree

Hide file tree

Showing 31 changed files with 2,627 additions and 1,395 deletions.
diff --git a/G2solver.xcodeproj/project.pbxproj b/G2solver.xcodeproj/project.pbxproj
@@ -41,6 +41,21 @@
 		D92EFA8A2186931500BF8E18 /* ClothoidG2.cc in Sources */ = {isa = PBXBuildFile; fileRef = D971F89B1F6169D2000E663E /* ClothoidG2.cc */; };
 		D92EFA8B2186931500BF8E18 /* PolyLine.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9E22EE0216CB48F00C033D2 /* PolyLine.cc */; };
 		D92EFA932186932B00BF8E18 /* testIntersect2.cc in Sources */ = {isa = PBXBuildFile; fileRef = D92EFA922186932B00BF8E18 /* testIntersect2.cc */; };
+		D92EFA962187B03600BF8E18 /* Line.cc in Sources */ = {isa = PBXBuildFile; fileRef = D918ADA51F62C1CE009893C3 /* Line.cc */; };
+		D92EFA972187B03600BF8E18 /* Triangle2D.cc in Sources */ = {isa = PBXBuildFile; fileRef = D938F4EA1DD3B84A00E08A70 /* Triangle2D.cc */; };
+		D92EFA982187B03600BF8E18 /* CubicRootsFlocke.cc in Sources */ = {isa = PBXBuildFile; fileRef = D938F4E81DD3B84A00E08A70 /* CubicRootsFlocke.cc */; };
+		D92EFA992187B03600BF8E18 /* Fresnel.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9099D1F1F5FFB8300740ECF /* Fresnel.cc */; };
+		D92EFA9A2187B03600BF8E18 /* Clothoid.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9FCD3352075552600553A10 /* Clothoid.cc */; };
+		D92EFA9B2187B03600BF8E18 /* G2lib.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9099D251F600AA600740ECF /* G2lib.cc */; };
+		D92EFA9C2187B03600BF8E18 /* ClothoidList.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9614FD41FB8609F007E5770 /* ClothoidList.cc */; };
+		D92EFA9E2187B03600BF8E18 /* Biarc.cc in Sources */ = {isa = PBXBuildFile; fileRef = D971F8971F613BC2000E663E /* Biarc.cc */; };
+		D92EFA9F2187B03600BF8E18 /* ClothoidAsyPlot.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9BD861A1EFC021300C82B74 /* ClothoidAsyPlot.cc */; };
+		D92EFAA02187B03600BF8E18 /* ClothoidDistance.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9FCD33C207556DD00553A10 /* ClothoidDistance.cc */; };
+		D92EFAA12187B03600BF8E18 /* Circle.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9099D281F600B9400740ECF /* Circle.cc */; };
+		D92EFAA22187B03600BF8E18 /* AABBtree.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9BA2F8D217FD93E009D45BD /* AABBtree.cc */; };
+		D92EFAA32187B03600BF8E18 /* ClothoidG2.cc in Sources */ = {isa = PBXBuildFile; fileRef = D971F89B1F6169D2000E663E /* ClothoidG2.cc */; };
+		D92EFAA42187B03600BF8E18 /* PolyLine.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9E22EE0216CB48F00C033D2 /* PolyLine.cc */; };
+		D92EFAAC2187B05800BF8E18 /* testIntersect3.cc in Sources */ = {isa = PBXBuildFile; fileRef = D92EFAAB2187B05800BF8E18 /* testIntersect3.cc */; };
 		D938F4EC1DD3B85000E08A70 /* CubicRootsFlocke.cc in Sources */ = {isa = PBXBuildFile; fileRef = D938F4E81DD3B84A00E08A70 /* CubicRootsFlocke.cc */; };
 		D938F4ED1DD3B85200E08A70 /* Triangle2D.cc in Sources */ = {isa = PBXBuildFile; fileRef = D938F4EA1DD3B84A00E08A70 /* Triangle2D.cc */; };
 		D9614FD51FB8609F007E5770 /* ClothoidList.cc in Sources */ = {isa = PBXBuildFile; fileRef = D9614FD41FB8609F007E5770 /* ClothoidList.cc */; };
@@ -190,6 +205,15 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 		};
+		D92EFAA62187B03600BF8E18 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
 		D938F4D91DD3B83000E08A70 /* CopyFiles */ = {
 			isa = PBXCopyFilesBuildPhase;
 			buildActionMask = 2147483647;
@@ -287,6 +311,8 @@
 		D918ADA51F62C1CE009893C3 /* Line.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Line.cc; sourceTree = "<group>"; };
 		D92EFA912186931500BF8E18 /* testIntersect2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testIntersect2; sourceTree = BUILT_PRODUCTS_DIR; };
 		D92EFA922186932B00BF8E18 /* testIntersect2.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testIntersect2.cc; sourceTree = "<group>"; };
+		D92EFAAA2187B03600BF8E18 /* testIntersect3 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = testIntersect3; sourceTree = BUILT_PRODUCTS_DIR; };
+		D92EFAAB2187B05800BF8E18 /* testIntersect3.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = testIntersect3.cc; sourceTree = "<group>"; };
 		D938F4DB1DD3B83000E08A70 /* G2solver */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = G2solver; sourceTree = BUILT_PRODUCTS_DIR; };
 		D938F4E71DD3B84A00E08A70 /* Clothoid.hh */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Clothoid.hh; sourceTree = "<group>"; };
 		D938F4E81DD3B84A00E08A70 /* CubicRootsFlocke.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CubicRootsFlocke.cc; sourceTree = "<group>"; };
@@ -339,6 +365,13 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		D92EFAA52187B03600BF8E18 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		D938F4D81DD3B83000E08A70 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
@@ -428,6 +461,7 @@
 				D9BFDB2620EE3C0E00612F3C /* testBiarc */,
 				D969AF8721708CC200CA4DD0 /* testPolyline */,
 				D92EFA912186931500BF8E18 /* testIntersect2 */,
+				D92EFAAA2187B03600BF8E18 /* testIntersect3 */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -476,6 +510,7 @@
 				D9179A8E206D2135006B66E7 /* testDistance.cc */,
 				D9C373A920BC485B00715C11 /* testIntersect.cc */,
 				D92EFA922186932B00BF8E18 /* testIntersect2.cc */,
+				D92EFAAB2187B05800BF8E18 /* testIntersect3.cc */,
 				D9AFBB7020E28F6900C498EF /* testTriangle2D.cc */,
 				D9BFDB2720EE3C2700612F3C /* testBiarc.cc */,
 				D969AF8821708CEF00CA4DD0 /* testPolyline.cc */,
@@ -520,6 +555,23 @@
 			productReference = D92EFA912186931500BF8E18 /* testIntersect2 */;
 			productType = "com.apple.product-type.tool";
 		};
+		D92EFA942187B03600BF8E18 /* testIntersect3 */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = D92EFAA72187B03600BF8E18 /* Build configuration list for PBXNativeTarget "testIntersect3" */;
+			buildPhases = (
+				D92EFA952187B03600BF8E18 /* Sources */,
+				D92EFAA52187B03600BF8E18 /* Frameworks */,
+				D92EFAA62187B03600BF8E18 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = testIntersect3;
+			productName = G2solver;
+			productReference = D92EFAAA2187B03600BF8E18 /* testIntersect3 */;
+			productType = "com.apple.product-type.tool";
+		};
 		D938F4DA1DD3B83000E08A70 /* G2solver */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = D938F4E21DD3B83000E08A70 /* Build configuration list for PBXNativeTarget "G2solver" */;
@@ -688,6 +740,9 @@
 					D92EFA7B2186931500BF8E18 = {
 						DevelopmentTeam = S8X788ZA8Y;
 					};
+					D92EFA942187B03600BF8E18 = {
+						DevelopmentTeam = S8X788ZA8Y;
+					};
 					D938F4DA1DD3B83000E08A70 = {
 						CreatedOnToolsVersion = 8.0;
 						DevelopmentTeam = S8X788ZA8Y;
@@ -736,6 +791,7 @@
 				D9179A7A206D211E006B66E7 /* testDistance */,
 				D9C3739320BC484100715C11 /* testIntersect */,
 				D92EFA7B2186931500BF8E18 /* testIntersect2 */,
+				D92EFA942187B03600BF8E18 /* testIntersect3 */,
 				D9AFBB5B20E28F5900C498EF /* testTriangle2D */,
 				D9BFDB1220EE3C0E00612F3C /* testBiarc */,
 				D969AF7221708CC200CA4DD0 /* testPolyline */,
@@ -788,6 +844,28 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
+		D92EFA952187B03600BF8E18 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				D92EFA962187B03600BF8E18 /* Line.cc in Sources */,
+				D92EFA972187B03600BF8E18 /* Triangle2D.cc in Sources */,
+				D92EFA982187B03600BF8E18 /* CubicRootsFlocke.cc in Sources */,
+				D92EFA992187B03600BF8E18 /* Fresnel.cc in Sources */,
+				D92EFA9A2187B03600BF8E18 /* Clothoid.cc in Sources */,
+				D92EFA9B2187B03600BF8E18 /* G2lib.cc in Sources */,
+				D92EFA9C2187B03600BF8E18 /* ClothoidList.cc in Sources */,
+				D92EFA9E2187B03600BF8E18 /* Biarc.cc in Sources */,
+				D92EFAAC2187B05800BF8E18 /* testIntersect3.cc in Sources */,
+				D92EFA9F2187B03600BF8E18 /* ClothoidAsyPlot.cc in Sources */,
+				D92EFAA02187B03600BF8E18 /* ClothoidDistance.cc in Sources */,
+				D92EFAA12187B03600BF8E18 /* Circle.cc in Sources */,
+				D92EFAA22187B03600BF8E18 /* AABBtree.cc in Sources */,
+				D92EFAA32187B03600BF8E18 /* ClothoidG2.cc in Sources */,
+				D92EFAA42187B03600BF8E18 /* PolyLine.cc in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
 		D938F4D71DD3B83000E08A70 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -1018,6 +1096,22 @@
 			};
 			name = Release;
 		};
+		D92EFAA82187B03600BF8E18 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = S8X788ZA8Y;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		D92EFAA92187B03600BF8E18 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				DEVELOPMENT_TEAM = S8X788ZA8Y;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
 		D938F4E01DD3B83000E08A70 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -1316,6 +1410,15 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
+		D92EFAA72187B03600BF8E18 /* Build configuration list for PBXNativeTarget "testIntersect3" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				D92EFAA82187B03600BF8E18 /* Debug */,
+				D92EFAA92187B03600BF8E18 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
 		D938F4D61DD3B83000E08A70 /* Build configuration list for PBXProject "G2solver" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (

diff --git a/...codeproj/project.xcworkspace/xcuserdata/enrico.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/enrico.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/G2solver.xcodeproj/xcshareddata/xcschemes/testIntersect3.xcscheme b/G2solver.xcodeproj/xcshareddata/xcschemes/testIntersect3.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D92EFA942187B03600BF8E18"
+               BuildableName = "testIntersect3"
+               BlueprintName = "testIntersect3"
+               ReferencedContainer = "container:G2solver.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D92EFA942187B03600BF8E18"
+            BuildableName = "testIntersect3"
+            BlueprintName = "testIntersect3"
+            ReferencedContainer = "container:G2solver.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D92EFA942187B03600BF8E18"
+            BuildableName = "testIntersect3"
+            BlueprintName = "testIntersect3"
+            ReferencedContainer = "container:G2solver.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D92EFA942187B03600BF8E18"
+            BuildableName = "testIntersect3"
+            BlueprintName = "testIntersect3"
+            ReferencedContainer = "container:G2solver.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/G2solver.xcodeproj/xcuserdata/enrico.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/G2solver.xcodeproj/xcuserdata/enrico.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -2,22 +2,4 @@
 <Bucket
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "tests-cpp/testIntersect2.cc"
-            timestampString = "562494595.252853"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "30"
-            endingLineNumber = "30"
-            landmarkName = "main()"
-            landmarkType = "9">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>
diff --git a/G2solver.xcodeproj/xcuserdata/enrico.xcuserdatad/xcschemes/xcschememanagement.plist b/G2solver.xcodeproj/xcuserdata/enrico.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -27,7 +27,7 @@
 		<key>testBiarc.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>9</integer>
+			<integer>10</integer>
 		</dict>
 		<key>testDistance.xcscheme_^#shared#^_</key>
 		<dict>
@@ -49,15 +49,20 @@
 			<key>orderHint</key>
 			<integer>7</integer>
 		</dict>
+		<key>testIntersect3.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>8</integer>
+		</dict>
 		<key>testPolyline.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>10</integer>
+			<integer>11</integer>
 		</dict>
 		<key>testTriangle2D.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>9</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
@@ -72,6 +77,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>D92EFA942187B03600BF8E18</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>D938F4DA1DD3B83000E08A70</key>
 		<dict>
 			<key>primary</key>