symbolic tests pass
							parent
							
								
									7712158bf2
								
							
						
					
					
						commit
						beeb91a26c
					
				| 
						 | 
					@ -731,10 +731,12 @@ TEST(SymbolicBayesTree, COLAMDvsMETIS) {
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    Ordering ordering = Ordering::Create(Ordering::METIS, sfg);
 | 
					    Ordering ordering = Ordering::Create(Ordering::METIS, sfg);
 | 
				
			||||||
// Linux and Mac split differently when using mettis
 | 
					// Linux and Mac split differently when using mettis
 | 
				
			||||||
#if !defined(__APPLE__)
 | 
					#if defined(__APPLE__)
 | 
				
			||||||
    EXPECT(assert_equal(Ordering(list_of(3)(2)(5)(0)(4)(1)), ordering));
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
    EXPECT(assert_equal(Ordering(list_of(5)(4)(2)(1)(0)(3)), ordering));
 | 
					    EXPECT(assert_equal(Ordering(list_of(5)(4)(2)(1)(0)(3)), ordering));
 | 
				
			||||||
 | 
					#elif defined(_WIN32)
 | 
				
			||||||
 | 
					    EXPECT(assert_equal(Ordering(list_of(4)(3)(1)(0)(5)(2)), ordering));
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					    EXPECT(assert_equal(Ordering(list_of(3)(2)(5)(0)(4)(1)), ordering));
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    //  - P( 1 0 3)
 | 
					    //  - P( 1 0 3)
 | 
				
			||||||
| 
						 | 
					@ -742,20 +744,27 @@ TEST(SymbolicBayesTree, COLAMDvsMETIS) {
 | 
				
			||||||
    //  | | - P( 5 | 0 4)
 | 
					    //  | | - P( 5 | 0 4)
 | 
				
			||||||
    //  | - P( 2 | 1 3)
 | 
					    //  | - P( 2 | 1 3)
 | 
				
			||||||
    SymbolicBayesTree expected;
 | 
					    SymbolicBayesTree expected;
 | 
				
			||||||
#if !defined(__APPLE__)
 | 
					#if defined(__APPLE__)
 | 
				
			||||||
    expected.insertRoot(
 | 
					 | 
				
			||||||
        MakeClique(list_of(2)(4)(1), 3,
 | 
					 | 
				
			||||||
            list_of(
 | 
					 | 
				
			||||||
                MakeClique(list_of(0)(1)(4), 1,
 | 
					 | 
				
			||||||
                    list_of(MakeClique(list_of(5)(0)(4), 1))))(
 | 
					 | 
				
			||||||
                MakeClique(list_of(3)(2)(4), 1))));
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
    expected.insertRoot(
 | 
					    expected.insertRoot(
 | 
				
			||||||
            MakeClique(list_of(1)(0)(3), 3,
 | 
					            MakeClique(list_of(1)(0)(3), 3,
 | 
				
			||||||
                list_of(
 | 
					                list_of(
 | 
				
			||||||
                    MakeClique(list_of(4)(0)(3), 1,
 | 
					                    MakeClique(list_of(4)(0)(3), 1,
 | 
				
			||||||
                        list_of(MakeClique(list_of(5)(0)(4), 1))))(
 | 
					                        list_of(MakeClique(list_of(5)(0)(4), 1))))(
 | 
				
			||||||
                    MakeClique(list_of(2)(1)(3), 1))));
 | 
					                    MakeClique(list_of(2)(1)(3), 1))));
 | 
				
			||||||
 | 
					#elif defined(_WIN32)
 | 
				
			||||||
 | 
					    expected.insertRoot(
 | 
				
			||||||
 | 
					            MakeClique(list_of(3)(5)(2), 3,
 | 
				
			||||||
 | 
					                list_of(
 | 
				
			||||||
 | 
					                    MakeClique(list_of(4)(3)(5), 1,
 | 
				
			||||||
 | 
					                        list_of(MakeClique(list_of(0)(2)(5), 1))))(
 | 
				
			||||||
 | 
					                    MakeClique(list_of(1)(0)(2), 1))));
 | 
				
			||||||
 | 
					#else
 | 
				
			||||||
 | 
					    expected.insertRoot(
 | 
				
			||||||
 | 
					        MakeClique(list_of(2)(4)(1), 3,
 | 
				
			||||||
 | 
					            list_of(
 | 
				
			||||||
 | 
					                MakeClique(list_of(0)(1)(4), 1,
 | 
				
			||||||
 | 
					                    list_of(MakeClique(list_of(5)(0)(4), 1))))(
 | 
				
			||||||
 | 
					                MakeClique(list_of(3)(2)(4), 1))));
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
    SymbolicBayesTree actual = *sfg.eliminateMultifrontal(ordering);
 | 
					    SymbolicBayesTree actual = *sfg.eliminateMultifrontal(ordering);
 | 
				
			||||||
    EXPECT(assert_equal(expected, actual));
 | 
					    EXPECT(assert_equal(expected, actual));
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue