Skip to content

Commit 57b99be

Browse files
committed
Wip on benchmark
1 parent b7b52cd commit 57b99be

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

benchmarks/chipmunk.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,6 @@
6060

6161
import pymunk
6262

63-
try:
64-
import pygame
65-
66-
import pymunk.pygame_util
67-
68-
pymunk.pygame_util.positive_y_is_up = True
69-
except:
70-
pass
71-
7263

7364
class Benchmark:
7465
steps = 500
@@ -176,7 +167,7 @@ def update(self, dt):
176167

177168

178169
class AddPair(Benchmark):
179-
steps = 1000
170+
steps = 3000
180171
default_size = 2000
181172
size_start = 100
182173
size_end = 2500
@@ -614,6 +605,12 @@ def run(bench_cls, size, interactive):
614605
sim_start_time = timeit.default_timer()
615606

616607
if interactive:
608+
import pygame
609+
610+
import pymunk.pygame_util
611+
612+
pymunk.pygame_util.positive_y_is_up = True
613+
617614
clock = pygame.time.Clock()
618615
screen = pygame.display.set_mode((600, 600))
619616
draw_options = pymunk.pygame_util.DrawOptions(screen)
@@ -671,7 +668,7 @@ def run(bench_cls, size, interactive):
671668
f"step {steps} fps {clock.get_fps():.2f} total {timeit.default_timer()-sim_start_time:.2f}s"
672669
)
673670

674-
sim.update(1 / fps)
671+
sim.update(1 / fps / 50)
675672
steps += 1
676673

677674
if not interactive and False: # temp disabled until end state is nice to look at.
@@ -710,7 +707,8 @@ def run(bench_cls, size, interactive):
710707
"-s",
711708
"--size",
712709
type=int,
713-
help="Size of simulation (e.g. number of items). Set to -1 to iterate the sizes",
710+
help="""Size of simulation (e.g. number of items). If not set uses a default size.
711+
Set to -1 to iterate the sizes""",
714712
)
715713
parser.add_argument(
716714
"-i",
@@ -723,7 +721,7 @@ def run(bench_cls, size, interactive):
723721

724722
csv_output = io.StringIO()
725723
writer = csv.DictWriter(
726-
csv_output, fieldnames=["benchmark", "size", "init_time", "run_time"]
724+
csv_output, fieldnames=["version", "benchmark", "size", "init_time", "run_time"]
727725
)
728726
writer.writeheader()
729727
for name in args.benchmarks:
@@ -750,6 +748,7 @@ def run(bench_cls, size, interactive):
750748

751749
res = run(bench_cls, size, args.interactive)
752750
print(res)
751+
res["version"] = pymunk.version
753752
writer.writerow(res)
754753
print("DONE!")
755754
print("Full Result:")

0 commit comments

Comments
 (0)