Author: janehu Date: 2011-03-31 13:37:02 -0500 (Thu, 31 Mar 2011) New Revision: 4699 Modified: cgm/branches/merge-cubit12/test/makept.cpp Log: Made calling adjustment for cubit12 updates; commented out curve creation from points and tangents test. This new added function in cubit 12 is not quite working yet, and there's a ticket 242 against it right now. Modified: cgm/branches/merge-cubit12/test/makept.cpp =================================================================== --- cgm/branches/merge-cubit12/test/makept.cpp 2011-03-31 18:08:27 UTC (rev 4698) +++ cgm/branches/merge-cubit12/test/makept.cpp 2011-03-31 18:37:02 UTC (rev 4699) @@ -300,9 +300,9 @@ //without checking for duplicates, so clean_out first. gti->get_free_ref_entities(free_entities); - RefVertex* vertex1 = CAST_TO(free_entities.get_and_step(),RefVertex); - RefVertex* vertex2 = CAST_TO(free_entities.get_and_step(),RefVertex); - RefVertex* vertex3 = CAST_TO(free_entities.get(),RefVertex); + RefVertex* vertex1 = CAST_TO(free_entities.step_and_get(),RefVertex); + RefVertex* vertex2 = CAST_TO(free_entities.step_and_get(),RefVertex); + RefVertex* vertex3 = CAST_TO(free_entities.step_and_get(),RefVertex); CubitBoolean is_equal = gti-> about_spatially_equal(vertex1,vertex2); assert(is_equal == CUBIT_FAILURE); @@ -319,12 +319,12 @@ vi = bodies.get()->center_point(); //first body's bounding box's center point. - min.set(16.67, 0, 14.58); + min.set(6.67, 0, 14.58); assert(vi.distance_between(min) < 0.01 ); CubitBox box = bodies.get()->bounding_box(); - min.set(-1.5894,-11.58944, 7.79849); - max.set(34.9303,11.58944,21.3615); + min.set(-11.5894,-11.58944, 7.79849); + max.set(24.9303,11.58944,21.3615); test_box.reset(min,max); assert(box >= test_box); test_box *= 1.01; @@ -333,7 +333,7 @@ gti->entity_entity_distance(gti->get_first_ref_volume(), vertex2,vi, vii,d); //first body and vertex2 's minimum distance(d) and locations for the minimum. - assert(d <11.8607 && d > 11.8606); + assert(d <3.64214 && d > 3.64213); // test create a Compound body. test_bodies.clean_out(); @@ -364,7 +364,7 @@ vi = CompBody->center_point(); gti->translate(CompBody,axis); vii =CompBody->center_point(); - assert(vii - vi == axis); + assert(axis.about_equal(vii - vi) ); // After parellel move, center point moved by x (10) vi = CompBody->center_point();