Added an assert_equal to handle optional values, and added a test for TestableAssertions
							parent
							
								
									ccf3e91b19
								
							
						
					
					
						commit
						3d2feb0406
					
				
							
								
								
									
										276
									
								
								.cproject
								
								
								
								
							
							
						
						
									
										276
									
								
								.cproject
								
								
								
								
							|  | @ -322,14 +322,6 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="linear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -356,6 +348,7 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testBayesTree.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testBayesTree.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -363,6 +356,7 @@ | |||
| 					</target> | ||||
| 					<target name="testBinaryBayesNet.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testBinaryBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -410,6 +404,7 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicBayesNet.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -417,6 +412,7 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testSymbolicFactor.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testSymbolicFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -424,6 +420,7 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicFactorGraph.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicFactorGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -439,11 +436,20 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testBayesTree" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testBayesTree</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="linear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -478,7 +484,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGraph.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -574,7 +579,6 @@ | |||
| 					</target> | ||||
| 					<target name="testInference.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testInference.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -582,7 +586,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGaussianBayesNet.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGaussianBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -590,7 +593,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -598,7 +600,6 @@ | |||
| 					</target> | ||||
| 					<target name="testJunctionTree.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testJunctionTree.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -606,7 +607,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicBayesNet.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -614,7 +614,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicFactorGraph.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicFactorGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -966,6 +965,7 @@ | |||
| 					</target> | ||||
| 					<target name="testErrors.run" path="linear" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testErrors.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -1325,7 +1325,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated2DOriented.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated2DOriented.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -1365,7 +1364,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated2D.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated2D.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -1373,7 +1371,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated3D.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated3D.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -1395,6 +1392,14 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="tests/testTestableAssertions.run" path="build/gtsam/base" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>tests/testTestableAssertions.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="tests/testVectorValues.run" path="build/gtsam/linear" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -1469,7 +1474,6 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testGaussianISAM2" path="build/slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testGaussianISAM2</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -1491,6 +1495,46 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>install</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>clean</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>all</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="dist" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>dist</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testRot3.run" path="geometry" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -1587,54 +1631,6 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>install</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>clean</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>all</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="dist" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>dist</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build/wrap" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -1667,6 +1663,14 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build/wrap" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 				</buildTargets> | ||||
| 			</storageModule> | ||||
| 		</cconfiguration> | ||||
|  | @ -1989,14 +1993,6 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="linear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -2023,6 +2019,7 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testBayesTree.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testBayesTree.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2030,6 +2027,7 @@ | |||
| 					</target> | ||||
| 					<target name="testBinaryBayesNet.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testBinaryBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2077,6 +2075,7 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicBayesNet.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2084,6 +2083,7 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testSymbolicFactor.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testSymbolicFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2091,6 +2091,7 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicFactorGraph.run" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicFactorGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2106,11 +2107,20 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testBayesTree" path="inference" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testBayesTree</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="linear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -2145,7 +2155,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGraph.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2241,7 +2250,6 @@ | |||
| 					</target> | ||||
| 					<target name="testInference.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testInference.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2249,7 +2257,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGaussianBayesNet.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGaussianBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2257,7 +2264,6 @@ | |||
| 					</target> | ||||
| 					<target name="testGaussianFactor.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testGaussianFactor.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2265,7 +2271,6 @@ | |||
| 					</target> | ||||
| 					<target name="testJunctionTree.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testJunctionTree.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2273,7 +2278,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicBayesNet.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicBayesNet.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2281,7 +2285,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSymbolicFactorGraph.run" path="tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSymbolicFactorGraph.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2633,6 +2636,7 @@ | |||
| 					</target> | ||||
| 					<target name="testErrors.run" path="linear" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testErrors.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -2992,7 +2996,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated2DOriented.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated2DOriented.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -3032,7 +3035,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated2D.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated2D.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -3040,7 +3042,6 @@ | |||
| 					</target> | ||||
| 					<target name="testSimulated3D.run" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>testSimulated3D.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -3062,6 +3063,14 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="tests/testTestableAssertions.run" path="build/gtsam/base" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>tests/testTestableAssertions.run</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="tests/testVectorValues.run" path="build/gtsam/linear" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -3136,7 +3145,6 @@ | |||
| 					</target> | ||||
| 					<target name="tests/testGaussianISAM2" path="build/slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments/> | ||||
| 						<buildTarget>tests/testGaussianISAM2</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>false</useDefaultCommand> | ||||
|  | @ -3158,6 +3166,46 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>install</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>clean</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>all</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="dist" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>dist</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="testRot3.run" path="geometry" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -3254,54 +3302,6 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="install" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>install</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="clean" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>clean</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="all" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>all</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="dist" path="" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>dist</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build/wrap" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
|  | @ -3334,6 +3334,14 @@ | |||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 					<target name="check" path="build/wrap" targetID="org.eclipse.cdt.build.MakeTargetBuilder"> | ||||
| 						<buildCommand>make</buildCommand> | ||||
| 						<buildArguments>-j2</buildArguments> | ||||
| 						<buildTarget>check</buildTarget> | ||||
| 						<stopOnError>true</stopOnError> | ||||
| 						<useDefaultCommand>true</useDefaultCommand> | ||||
| 						<runAllBuilders>true</runAllBuilders> | ||||
| 					</target> | ||||
| 				</buildTargets> | ||||
| 			</storageModule> | ||||
| 		</cconfiguration> | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ endif | |||
| # Testing
 | ||||
| headers += Testable.h TestableAssertions.h numericalDerivative.h | ||||
| sources += timing.cpp debug.cpp | ||||
| check_PROGRAMS += tests/testDebug | ||||
| check_PROGRAMS += tests/testDebug tests/testTestableAssertions | ||||
| 
 | ||||
| # Lie Groups
 | ||||
| headers += Lie.h Lie-inl.h lieProxies.h LieScalar.h | ||||
|  |  | |||
|  | @ -21,6 +21,7 @@ | |||
| #include <map> | ||||
| #include <iostream> | ||||
| #include <boost/foreach.hpp> | ||||
| #include <boost/optional.hpp> | ||||
| #include <gtsam/base/types.h> | ||||
| #include <gtsam/base/Testable.h> | ||||
| 
 | ||||
|  | @ -37,6 +38,39 @@ bool assert_equal(const Index& expected, const Index& actual, double tol = 0.0) | |||
|   return true; | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|  * Comparisons for boost.optional objects that checks whether objects exist | ||||
|  * before comparing their values. First version allows for both to be | ||||
|  * boost::none, but the second, with expected given rather than optional | ||||
|  * | ||||
|  * Concept requirement: V is testable | ||||
|  */ | ||||
| template<class V> | ||||
| bool assert_equal(const boost::optional<V>& expected, | ||||
| 									const boost::optional<V>& actual, double tol = 1e-9) { | ||||
| 	if (!expected && actual) { | ||||
| 		std::cout << "expected is boost::none, while actual is not" << std::endl; | ||||
| 		return false; | ||||
| 	} | ||||
| 	if (expected && !actual) { | ||||
| 		std::cout << "actual is boost::none, while expected is not" << std::endl; | ||||
| 		return false; | ||||
| 	} | ||||
| 	if (!expected && !actual) | ||||
| 		return true; | ||||
| 	return assert_equal(*expected, *actual, tol); | ||||
| } | ||||
| 
 | ||||
| template<class V> | ||||
| bool assert_equal(const V& expected, const boost::optional<V>& actual, double tol = 1e-9) { | ||||
| 	if (!actual) { | ||||
| 		std::cout << "actual is boost::none" << std::endl; | ||||
| 		return false; | ||||
| 	} | ||||
| 	return assert_equal(expected, *actual, tol); | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| /**
 | ||||
|  * Version of assert_equals to work with vectors | ||||
|  * @DEPRECIATED: use container equals instead | ||||
|  |  | |||
|  | @ -0,0 +1,25 @@ | |||
| /**
 | ||||
|  * @file testTestableAssertions | ||||
|  * @author Alex Cunningham | ||||
|  */ | ||||
| 
 | ||||
| #include <CppUnitLite/TestHarness.h> | ||||
| 
 | ||||
| #include <gtsam/base/LieScalar.h> | ||||
| #include <gtsam/base/TestableAssertions.h> | ||||
| 
 | ||||
| using namespace gtsam; | ||||
| 
 | ||||
| /* ************************************************************************* */ | ||||
| TEST( testTestableAssertions, optional ) { | ||||
| 	typedef boost::optional<LieScalar> OptionalScalar; | ||||
| 	LieScalar x(1.0); | ||||
| 	OptionalScalar ox(x), dummy = boost::none; | ||||
| 	EXPECT(assert_equal(ox, ox)); | ||||
| 	EXPECT(assert_equal(x, ox)); | ||||
| 	EXPECT(assert_equal(dummy, dummy)); | ||||
| } | ||||
| 
 | ||||
| /* ************************************************************************* */ | ||||
| int main() { TestResult tr; return TestRegistry::runAllTests(tr); } | ||||
| /* ************************************************************************* */ | ||||
		Loading…
	
		Reference in New Issue