made performance test a bit more configurable
This commit is contained in:
parent
6f4ebe93d4
commit
6b26a009f1
|
@ -14,10 +14,10 @@ from geosolver.intersections import distance_2p, angle_3p
|
||||||
from time import time
|
from time import time
|
||||||
|
|
||||||
# create statistics for solving time
|
# create statistics for solving time
|
||||||
def stats_solving():
|
def stats_solving(minsize, maxsize, repeats):
|
||||||
print "size \t # \t time \t result"
|
print "size \t # \t time \t result"
|
||||||
for size in range(4,31):
|
for size in range(minsize,maxsize+1):
|
||||||
for i in range(1,10):
|
for i in range(1,repeats+1):
|
||||||
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
||||||
t1 = time()
|
t1 = time()
|
||||||
solver = GeometricSolver(problem)
|
solver = GeometricSolver(problem)
|
||||||
|
@ -27,11 +27,11 @@ def stats_solving():
|
||||||
print size,"\t",i,"\t",t,"\t",result
|
print size,"\t",i,"\t",t,"\t",result
|
||||||
|
|
||||||
# create statistics for incremental solving time
|
# create statistics for incremental solving time
|
||||||
def stats_incremental():
|
def stats_incremental(minsize, maxsize, repeats):
|
||||||
#diag_select("clsolver.remove")
|
#diag_select("clsolver.remove")
|
||||||
print "size \t # \t time \t result"
|
print "size \t # \t time \t result"
|
||||||
for size in range(4,31):
|
for size in range(minsize,maxsize+1):
|
||||||
for i in range(1,10):
|
for i in range(1,repeats+1):
|
||||||
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
||||||
solver = GeometricSolver(problem)
|
solver = GeometricSolver(problem)
|
||||||
t1 = time()
|
t1 = time()
|
||||||
|
@ -44,33 +44,28 @@ def stats_incremental():
|
||||||
print size,"\t",i,"\t",t,"\t",result
|
print size,"\t",i,"\t",t,"\t",result
|
||||||
|
|
||||||
# create statistics for parametric change
|
# create statistics for parametric change
|
||||||
def stats_parametric_incremental():
|
def stats_parametric_incremental(minsize, maxsize, repeats):
|
||||||
#diag_select("clsolver.remove")
|
#diag_select("clsolver.remove")
|
||||||
print "size \t # \t time \t result"
|
print "size \t # \t time \t result"
|
||||||
for size in range(4,31):
|
for size in range(minsize,maxsize+1):
|
||||||
for i in range(1,10):
|
for i in range(1,repeats+1):
|
||||||
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
||||||
solver = GeometricSolver(problem)
|
solver = GeometricSolver(problem)
|
||||||
constraint = random.choice(problem.cg.constraints())
|
constraint = random.choice(problem.cg.constraints())
|
||||||
#problem.rem_constraint(constraint)
|
|
||||||
#problem.add_constraint(constraint)
|
|
||||||
#problem.rem_constraint(constraint)
|
|
||||||
#problem.add_constraint(constraint)
|
|
||||||
t1 = time()
|
t1 = time()
|
||||||
#problem.rem_constraint(constraint)
|
problem.rem_constraint(constraint)
|
||||||
#problem.add_constraint(constraint)
|
problem.add_constraint(constraint)
|
||||||
#constraint.set_parameter(constraint.get_parameter())
|
|
||||||
result = solver.get_status()
|
result = solver.get_status()
|
||||||
t2 = time()
|
t2 = time()
|
||||||
t = t2-t1
|
t = t2-t1
|
||||||
print size,"\t",i,"\t",t,"\t",result
|
print size,"\t",i,"\t",t,"\t",result
|
||||||
|
|
||||||
# create statistics for parametric change
|
# create statistics for parametric change
|
||||||
def stats_parametric():
|
def stats_parametric(minsize, maxsize, repeats):
|
||||||
#diag_select("clsolver.remove")
|
#diag_select("clsolver.remove")
|
||||||
print "size \t # \t time \t result"
|
print "size \t # \t time \t result"
|
||||||
for size in range(4,31):
|
for size in range(minsize,maxsize+1):
|
||||||
for i in range(1,10):
|
for i in range(1,repeats+1):
|
||||||
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
problem = random_triangular_problem_3D(size,10.0,0.0,0.0)
|
||||||
solver = GeometricSolver(problem)
|
solver = GeometricSolver(problem)
|
||||||
constraint = random.choice(problem.cg.constraints())
|
constraint = random.choice(problem.cg.constraints())
|
||||||
|
@ -82,10 +77,13 @@ def stats_parametric():
|
||||||
print size,"\t",i,"\t",t,"\t",result
|
print size,"\t",i,"\t",t,"\t",result
|
||||||
|
|
||||||
def runstats():
|
def runstats():
|
||||||
stats_solving()
|
minsize = 4
|
||||||
stats_incremental()
|
maxsize = 10
|
||||||
stats_parametric_incremental()
|
repeats = 1
|
||||||
stats_parametric()
|
stats_solving(minsize, maxsize, repeats)
|
||||||
|
stats_incremental(minsize, maxsize, repeats)
|
||||||
|
stats_parametric_incremental(minsize, maxsize, repeats)
|
||||||
|
stats_parametric(minsize, maxsize, repeats)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
runstats()
|
runstats()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user