Organized fixtures

likaigelikaige · Mar 3, 2020 · dffaa45 · dffaa45
1 parent 5f8d487
commit dffaa45
Show file tree

Hide file tree

Showing 101 changed files with 10 additions and 1,867 deletions.
diff --git a/fixtures/box2d/Box2D-box-sim.json → comparisons/Box2D/fixture/Box2D-box-sim.json b/fixtures/box2d/Box2D-box-sim.json → comparisons/Box2D/fixture/Box2D-box-sim.json
diff --git a/fixtures/box2d/Box2D-box-sim_all2.vtk → ...sons/Box2D/fixture/Box2D-box-sim_all2.vtk b/fixtures/box2d/Box2D-box-sim_all2.vtk → ...sons/Box2D/fixture/Box2D-box-sim_all2.vtk
diff --git a/fixtures/billiards-ncp.json → comparisons/STIV/billiards-ncp.json b/fixtures/billiards-ncp.json → comparisons/STIV/billiards-ncp.json
diff --git a/fixtures/bouncing-diamond-ncp.json → comparisons/STIV/bouncing-diamond-ncp.json b/fixtures/bouncing-diamond-ncp.json → comparisons/STIV/bouncing-diamond-ncp.json
diff --git a/fixtures/chain-cross-section-ncp.json → ...arisons/STIV/chain-cross-section-ncp.json b/fixtures/chain-cross-section-ncp.json → ...arisons/STIV/chain-cross-section-ncp.json
diff --git a/fixtures/compactor-ncp.json → comparisons/STIV/compactor-ncp.json b/fixtures/compactor-ncp.json → comparisons/STIV/compactor-ncp.json
diff --git a/...volume__gravity_falling_diamond_vert.json → ...volume__gravity_falling_diamond_vert.json b/...volume__gravity_falling_diamond_vert.json → ...volume__gravity_falling_diamond_vert.json
diff --git a/...ures/ncp-test/volume__rb_falling_box.json → ...STIV/ncp-test/volume__rb_falling_box.json b/...ures/ncp-test/volume__rb_falling_box.json → ...STIV/ncp-test/volume__rb_falling_box.json
diff --git a/...avity_square_falling_DIAG_onto_floor.json → ...avity_square_falling_DIAG_onto_floor.json b/...avity_square_falling_DIAG_onto_floor.json → ...avity_square_falling_DIAG_onto_floor.json
diff --git a/fixtures/axle.json → fixtures/2D/axle.json b/fixtures/axle.json → fixtures/2D/axle.json
diff --git a/fixtures/billiards.json → fixtures/2D/billiards.json b/fixtures/billiards.json → fixtures/2D/billiards.json
diff --git a/fixtures/chain-cross-section.json → fixtures/2D/chain/chain-cross-section.json b/fixtures/chain-cross-section.json → fixtures/2D/chain/chain-cross-section.json
diff --git a/fixtures/chain/complex_1_link_chain.json → fixtures/2D/chain/volumetric/1_link.json b/fixtures/chain/complex_1_link_chain.json → fixtures/2D/chain/volumetric/1_link.json
diff --git a/fixtures/chain/complex_2_link_chain.json → fixtures/2D/chain/volumetric/2_links.json b/fixtures/chain/complex_2_link_chain.json → fixtures/2D/chain/volumetric/2_links.json
diff --git a/fixtures/chain/complex_3_link_chain.json → fixtures/2D/chain/volumetric/3_links.json b/fixtures/chain/complex_3_link_chain.json → fixtures/2D/chain/volumetric/3_links.json
diff --git a/fixtures/chain/10_link_chain.json → ...ures/2D/chain/wire/diagonal/10_links.json b/fixtures/chain/10_link_chain.json → ...ures/2D/chain/wire/diagonal/10_links.json
diff --git a/fixtures/chain/3_link_chain.json → fixtures/2D/chain/wire/diagonal/3_links.json b/fixtures/chain/3_link_chain.json → fixtures/2D/chain/wire/diagonal/3_links.json
diff --git a/fixtures/chain/6_link_chain.json → fixtures/2D/chain/wire/diagonal/6_links.json b/fixtures/chain/6_link_chain.json → fixtures/2D/chain/wire/diagonal/6_links.json
diff --git a/fixtures/chain/9_link_chain.json → fixtures/2D/chain/wire/diagonal/9_links.json b/fixtures/chain/9_link_chain.json → fixtures/2D/chain/wire/diagonal/9_links.json
diff --git a/fixtures/chain/simple-chain/10_links.json → ...es/2D/chain/wire/horizontal/10_links.json b/fixtures/chain/simple-chain/10_links.json → ...es/2D/chain/wire/horizontal/10_links.json
diff --git a/fixtures/chain/simple-chain/12_links.json → ...es/2D/chain/wire/horizontal/12_links.json b/fixtures/chain/simple-chain/12_links.json → ...es/2D/chain/wire/horizontal/12_links.json
diff --git a/fixtures/chain/simple-chain/30_links.json → ...es/2D/chain/wire/horizontal/30_links.json b/fixtures/chain/simple-chain/30_links.json → ...es/2D/chain/wire/horizontal/30_links.json
diff --git a/fixtures/chain/simple-chain/4_links.json → ...res/2D/chain/wire/horizontal/4_links.json b/fixtures/chain/simple-chain/4_links.json → ...res/2D/chain/wire/horizontal/4_links.json
diff --git a/fixtures/chain/simple-chain/6_links.json → ...res/2D/chain/wire/horizontal/6_links.json b/fixtures/chain/simple-chain/6_links.json → ...res/2D/chain/wire/horizontal/6_links.json
diff --git a/fixtures/chain/simple-chain/8_links.json → ...res/2D/chain/wire/horizontal/8_links.json b/fixtures/chain/simple-chain/8_links.json → ...res/2D/chain/wire/horizontal/8_links.json
diff --git a/fixtures/chain/simple_1_link_chain.json → fixtures/2D/chain/wire/vertical/1_link.json b/fixtures/chain/simple_1_link_chain.json → fixtures/2D/chain/wire/vertical/1_link.json
diff --git a/fixtures/chain/simple_2_link_chain.json → fixtures/2D/chain/wire/vertical/2_links.json b/fixtures/chain/simple_2_link_chain.json → fixtures/2D/chain/wire/vertical/2_links.json
diff --git a/fixtures/chain/simple_3_link_chain.json → fixtures/2D/chain/wire/vertical/3_links.json b/fixtures/chain/simple_3_link_chain.json → fixtures/2D/chain/wire/vertical/3_links.json
diff --git a/fixtures/cog-large.json → fixtures/2D/cogs/cog-large.json b/fixtures/cog-large.json → fixtures/2D/cogs/cog-large.json
diff --git a/fixtures/cog-line.json → fixtures/2D/cogs/cog-line.json b/fixtures/cog-line.json → fixtures/2D/cogs/cog-line.json
diff --git a/fixtures/cog-loop.json → fixtures/2D/cogs/cog-loop.json b/fixtures/cog-loop.json → fixtures/2D/cogs/cog-loop.json
diff --git a/fixtures/compactor.json → fixtures/2D/compactor.json b/fixtures/compactor.json → fixtures/2D/compactor.json
diff --git a/fixtures/filling-box-num_blocks=100.json → fixtures/2D/filling-box/num_blocks=100.json b/fixtures/filling-box-num_blocks=100.json → fixtures/2D/filling-box/num_blocks=100.json
diff --git a/fixtures/filling-box-num_blocks=2.json → fixtures/2D/filling-box/num_blocks=2.json b/fixtures/filling-box-num_blocks=2.json → fixtures/2D/filling-box/num_blocks=2.json
diff --git a/fixtures/filling-box-num_blocks=25.json → fixtures/2D/filling-box/num_blocks=25.json b/fixtures/filling-box-num_blocks=25.json → fixtures/2D/filling-box/num_blocks=25.json
diff --git a/...ons-cradle-num_balls=2-num_points=10.json → ...ons-cradle/num_balls=2-num_points=10.json b/...ons-cradle-num_balls=2-num_points=10.json → ...ons-cradle/num_balls=2-num_points=10.json
diff --git a/...adle-num_balls=2-num_points=4-cor=-1.json → ...adle/num_balls=2-num_points=4-cor=-1.json b/...adle-num_balls=2-num_points=4-cor=-1.json → ...adle/num_balls=2-num_points=4-cor=-1.json
diff --git a/...ons-cradle-num_balls=2-num_points=50.json → ...ons-cradle/num_balls=2-num_points=50.json b/...ons-cradle-num_balls=2-num_points=50.json → ...ons-cradle/num_balls=2-num_points=50.json
diff --git a/...um_balls=5-num_points=100-not-walled.json → ...um_balls=5-num_points=100-not-walled.json b/...um_balls=5-num_points=100-not-walled.json → ...um_balls=5-num_points=100-not-walled.json
diff --git a/...ns-cradle-num_balls=5-num_points=100.json → ...ns-cradle/num_balls=5-num_points=100.json b/...ns-cradle-num_balls=5-num_points=100.json → ...ns-cradle/num_balls=5-num_points=100.json
diff --git a/...tons-cradle-num_balls=5-num_points=3.json → ...tons-cradle/num_balls=5-num_points=3.json b/...tons-cradle-num_balls=5-num_points=3.json → ...tons-cradle/num_balls=5-num_points=3.json
diff --git a/...num_balls=5-num_points=4-not-rotated.json → ...num_balls=5-num_points=4-not-rotated.json b/...num_balls=5-num_points=4-not-rotated.json → ...num_balls=5-num_points=4-not-rotated.json
diff --git a/...tons-cradle-num_balls=5-num_points=4.json → ...tons-cradle/num_balls=5-num_points=4.json b/...tons-cradle-num_balls=5-num_points=4.json → ...tons-cradle/num_balls=5-num_points=4.json
diff --git a/...adle-num_balls=5-num_points=8-cor=-1.json → ...adle/num_balls=5-num_points=8-cor=-1.json b/...adle-num_balls=5-num_points=8-cor=-1.json → ...adle/num_balls=5-num_points=8-cor=-1.json
diff --git a/...radle-num_balls=5-num_points=8-cor=1.json → ...radle/num_balls=5-num_points=8-cor=1.json b/...radle-num_balls=5-num_points=8-cor=1.json → ...radle/num_balls=5-num_points=8-cor=1.json
diff --git a/...id_bodies_cor/barrier__diagonal_fall.json → ...estitution/bouncing_diamond_diagonal.json b/...id_bodies_cor/barrier__diagonal_fall.json → ...estitution/bouncing_diamond_diagonal.json
@@ -1,13 +1,12 @@
 {
+    "scene_type": "distance_barrier_rb_problem",
     "max_iterations": 300,
     "timestep_size": 0.1,
-    "scene_type": "distance_barrier_rb_problem",
     "distance_barrier_constraint": {
         "custom_initial_epsilon": 0.1,
         "detection_method": "hash_grid",
         "use_distance_hashgrid": true,
         "active_constraint_scale": 1.01,
-        "custom_hashgrid_cellsize": -1
     },
     "barrier_solver": {
         "e_b": 1e-10,
@@ -26,8 +25,7 @@
             0.0,
             -3.0
         ],
-        "rigid_bodies": [
-            {
+        "rigid_bodies": [{
                 "oriented": true,
                 "vertices": [
                     [

diff --git a/...id_bodies_cor/barrier__vertical_fall.json → ...estitution/bouncing_diamond_vertical.json b/...id_bodies_cor/barrier__vertical_fall.json → ...estitution/bouncing_diamond_vertical.json
diff --git a/...odies_cor/falling_onto_fixed_xy_edge.json → ...stitution/falling_onto_fixed_xy_edge.json b/...odies_cor/falling_onto_fixed_xy_edge.json → ...stitution/falling_onto_fixed_xy_edge.json
@@ -1,5 +1,5 @@
 {
-    "max_iterations": 300,
+    "max_iterations": 150,
     "timestep_size": 0.1,
     "scene_type": "distance_barrier_rb_problem",
     "distance_barrier_constraint": {
@@ -25,8 +25,7 @@
             0.0,
             -1.0
         ],
-        "rigid_bodies": [
-            {
+        "rigid_bodies": [{
                 "vertices": [
                     [
                         -1,

diff --git a/...wo_rectangles_one_moving_horizontaly.json → ...res/2D/restitution/horizontal_impact.json b/...wo_rectangles_one_moving_horizontaly.json → ...res/2D/restitution/horizontal_impact.json
diff --git a/...s/saw/interlocking-saws-num-teeth=10.json → ...D/saw/interlocking-saws/num-teeth=10.json b/...s/saw/interlocking-saws-num-teeth=10.json → ...D/saw/interlocking-saws/num-teeth=10.json
diff --git a/.../saw/interlocking-saws-num-teeth=100.json → .../saw/interlocking-saws/num-teeth=100.json b/.../saw/interlocking-saws-num-teeth=100.json → .../saw/interlocking-saws/num-teeth=100.json
diff --git a/...saw/interlocking-saws-num-teeth=1000.json → ...saw/interlocking-saws/num-teeth=1000.json b/...saw/interlocking-saws-num-teeth=1000.json → ...saw/interlocking-saws/num-teeth=1000.json
diff --git a/fixtures/saw/saw-cor=-1.json → ...D/saw/square-falling-onto-saw/cor=-1.json b/fixtures/saw/saw-cor=-1.json → ...D/saw/square-falling-onto-saw/cor=-1.json
diff --git a/fixtures/saw/saw-cor=0.json → ...2D/saw/square-falling-onto-saw/cor=0.json b/fixtures/saw/saw-cor=0.json → ...2D/saw/square-falling-onto-saw/cor=0.json
diff --git a/fixtures/saw/saw-cor=1.json → ...2D/saw/square-falling-onto-saw/cor=1.json b/fixtures/saw/saw-cor=1.json → ...2D/saw/square-falling-onto-saw/cor=1.json
diff --git a/...es/gravity_square_falling_onto_floor.json → ...le/gravity_square_falling_onto_floor.json b/...es/gravity_square_falling_onto_floor.json → ...le/gravity_square_falling_onto_floor.json
diff --git a/fixtures/rigid_bodies/one_rb_stationary.json → fixtures/2D/simple/one_rb_stationary.json b/fixtures/rigid_bodies/one_rb_stationary.json → fixtures/2D/simple/one_rb_stationary.json
diff --git a/...bodies/square_angular_and_linear_vel.json → ...simple/square_angular_and_linear_vel.json b/...bodies/square_angular_and_linear_vel.json → ...simple/square_angular_and_linear_vel.json
diff --git a/...ures/rigid_bodies/square_angular_vel.json → fixtures/2D/simple/square_angular_vel.json b/...ures/rigid_bodies/square_angular_vel.json → fixtures/2D/simple/square_angular_vel.json
diff --git a/...square_falling_diagonally_onto_floor.json → ...square_falling_diagonally_onto_floor.json b/...square_falling_diagonally_onto_floor.json → ...square_falling_diagonally_onto_floor.json
diff --git a/...gid_bodies/square_falling_onto_floor.json → .../2D/simple/square_falling_onto_floor.json b/...gid_bodies/square_falling_onto_floor.json → .../2D/simple/square_falling_onto_floor.json
diff --git a/...es/square_falling_rotating_onto_foor.json → ...le/square_falling_rotating_onto_foor.json b/...es/square_falling_rotating_onto_foor.json → ...le/square_falling_rotating_onto_foor.json
diff --git a/fixtures/rigid_bodies/square_linear_vel.json → fixtures/2D/simple/square_linear_vel.json b/fixtures/rigid_bodies/square_linear_vel.json → fixtures/2D/simple/square_linear_vel.json
diff --git a/...square_falling_diagonally_onto_floor.json → ...square_falling_diagonally_onto_floor.json b/...square_falling_diagonally_onto_floor.json → ...square_falling_diagonally_onto_floor.json
diff --git a/...lling_diagonally_onto_floor_touching.json → ...lling_diagonally_onto_floor_touching.json b/...lling_diagonally_onto_floor_touching.json → ...lling_diagonally_onto_floor_touching.json
diff --git a/...odies/step_square_falling_onto_floor.json → ...imple/step_square_falling_onto_floor.json b/...odies/step_square_falling_onto_floor.json → ...imple/step_square_falling_onto_floor.json
diff --git a/...p_square_falling_onto_floor_touching.json → ...p_square_falling_onto_floor_touching.json b/...p_square_falling_onto_floor_touching.json → ...p_square_falling_onto_floor_touching.json
diff --git a/...s/step_two_square_falling_onto_floor.json → ...e/step_two_square_falling_onto_floor.json b/...s/step_two_square_falling_onto_floor.json → ...e/step_two_square_falling_onto_floor.json
diff --git a/...odies/two_squares_falling_onto_floor.json → ...imple/two_squares_falling_onto_floor.json b/...odies/two_squares_falling_onto_floor.json → ...imple/two_squares_falling_onto_floor.json
diff --git a/fixtures/rigid_bodies/vee.json → fixtures/2D/simple/vee.json b/fixtures/rigid_bodies/vee.json → fixtures/2D/simple/vee.json
diff --git a/...k-num_line=10-thickness=0.01-v0=-100.json → ...k/num_line=10-thickness=0.01-v0=-100.json b/...k-num_line=10-thickness=0.01-v0=-100.json → ...k/num_line=10-thickness=0.01-v0=-100.json
diff --git a/...-num_line=10-thickness=0.01-v0=-1000.json → .../num_line=10-thickness=0.01-v0=-1000.json b/...-num_line=10-thickness=0.01-v0=-1000.json → .../num_line=10-thickness=0.01-v0=-1000.json
diff --git a/...num_line=10-thickness=0.01-v0=-10000.json → ...num_line=10-thickness=0.01-v0=-10000.json b/...num_line=10-thickness=0.01-v0=-10000.json → ...num_line=10-thickness=0.01-v0=-10000.json
diff --git a/fixtures/stacking/pyramid-cor=-1.json → fixtures/2D/stacking/pyramid-cor=-1.json b/fixtures/stacking/pyramid-cor=-1.json → fixtures/2D/stacking/pyramid-cor=-1.json
diff --git a/...locks=10-cor=-1-x_offset=0.6-falling.json → ...locks=10-cor=-1-x_offset=0.6-falling.json b/...locks=10-cor=-1-x_offset=0.6-falling.json → ...locks=10-cor=-1-x_offset=0.6-falling.json
diff --git a/...wer-num_blocks=2-cor=-1-x_offset=0.6.json → ...wer/num_blocks=2-cor=-1-x_offset=0.6.json b/...wer-num_blocks=2-cor=-1-x_offset=0.6.json → ...wer/num_blocks=2-cor=-1-x_offset=0.6.json
diff --git a/...tower-num_blocks=2-cor=-1-x_offset=0.json → ...tower/num_blocks=2-cor=-1-x_offset=0.json b/...tower-num_blocks=2-cor=-1-x_offset=0.json → ...tower/num_blocks=2-cor=-1-x_offset=0.json
diff --git a/.../tower-num_blocks=2-cor=1-x_offset=0.json → .../tower/num_blocks=2-cor=1-x_offset=0.json b/.../tower-num_blocks=2-cor=1-x_offset=0.json → .../tower/num_blocks=2-cor=1-x_offset=0.json
diff --git a/...m_blocks=3-cor=-1-x_offset=0-rotated.json → ...m_blocks=3-cor=-1-x_offset=0-rotated.json b/...m_blocks=3-cor=-1-x_offset=0-rotated.json → ...m_blocks=3-cor=-1-x_offset=0-rotated.json
diff --git a/...wer-num_blocks=3-cor=-1-x_offset=0.4.json → ...wer/num_blocks=3-cor=-1-x_offset=0.4.json b/...wer-num_blocks=3-cor=-1-x_offset=0.4.json → ...wer/num_blocks=3-cor=-1-x_offset=0.4.json
diff --git a/...tower-num_blocks=3-cor=-1-x_offset=0.json → ...tower/num_blocks=3-cor=-1-x_offset=0.json b/...tower-num_blocks=3-cor=-1-x_offset=0.json → ...tower/num_blocks=3-cor=-1-x_offset=0.json
diff --git a/..._blocks=3-cor=0.5-x_offset=0-rotated.json → ..._blocks=3-cor=0.5-x_offset=0-rotated.json b/..._blocks=3-cor=0.5-x_offset=0-rotated.json → ..._blocks=3-cor=0.5-x_offset=0-rotated.json
diff --git a/...es/stacking/tower-num_blocks=3-hanoi.json → ...2D/stacking/tower/num_blocks=3-hanoi.json b/...es/stacking/tower-num_blocks=3-hanoi.json → ...2D/stacking/tower/num_blocks=3-hanoi.json
diff --git a/...m_blocks=4-cor=-1-x_offset=0-falling.json → ...m_blocks=4-cor=-1-x_offset=0-falling.json b/...m_blocks=4-cor=-1-x_offset=0-falling.json → ...m_blocks=4-cor=-1-x_offset=0-falling.json
diff --git a/...=4-cor=-1-x_offset=0-rotated-falling.json → ...=4-cor=-1-x_offset=0-rotated-falling.json b/...=4-cor=-1-x_offset=0-rotated-falling.json → ...=4-cor=-1-x_offset=0-rotated-falling.json
diff --git a/...m_blocks=4-cor=-1-x_offset=0-rotated.json → ...m_blocks=4-cor=-1-x_offset=0-rotated.json b/...m_blocks=4-cor=-1-x_offset=0-rotated.json → ...m_blocks=4-cor=-1-x_offset=0-rotated.json
diff --git a/...tower-num_blocks=4-cor=-1-x_offset=0.json → ...tower/num_blocks=4-cor=-1-x_offset=0.json b/...tower-num_blocks=4-cor=-1-x_offset=0.json → ...tower/num_blocks=4-cor=-1-x_offset=0.json
diff --git a/...um_blocks=4-cor=0-x_offset=0-falling.json → ...um_blocks=4-cor=0-x_offset=0-falling.json b/...um_blocks=4-cor=0-x_offset=0-falling.json → ...um_blocks=4-cor=0-x_offset=0-falling.json
diff --git a/...s=4-cor=0-x_offset=0-rotated-falling.json → ...s=4-cor=0-x_offset=0-rotated-falling.json b/...s=4-cor=0-x_offset=0-rotated-falling.json → ...s=4-cor=0-x_offset=0-rotated-falling.json
diff --git a/...um_blocks=4-cor=0-x_offset=0-rotated.json → ...um_blocks=4-cor=0-x_offset=0-rotated.json b/...um_blocks=4-cor=0-x_offset=0-rotated.json → ...um_blocks=4-cor=0-x_offset=0-rotated.json
diff --git a/...um_blocks=4-cor=1-x_offset=0-rotated.json → ...um_blocks=4-cor=1-x_offset=0-rotated.json b/...um_blocks=4-cor=1-x_offset=0-rotated.json → ...um_blocks=4-cor=1-x_offset=0-rotated.json
diff --git a/...m_blocks=4-cor=10-x_offset=0-rotated.json → ...m_blocks=4-cor=10-x_offset=0-rotated.json b/...m_blocks=4-cor=10-x_offset=0-rotated.json → ...m_blocks=4-cor=10-x_offset=0-rotated.json
diff --git a/fixtures/rigid_bodies/box_rotating.json → fixtures/2D/tumbler.json b/fixtures/rigid_bodies/box_rotating.json → fixtures/2D/tumbler.json
diff --git a/fixtures/3D.json → fixtures/3D/example.json b/fixtures/3D.json → fixtures/3D/example.json
diff --git a/fixtures/bouncing-diamond.json b/fixtures/bouncing-diamond.json