diff --git a/Benchmark.py b/Benchmark.py index 5c93f735d3df825736ba0c5c8f610b9e7b57dfdf..c13b510f554bac6a150a6e22ae169098de563948 100644 --- a/Benchmark.py +++ b/Benchmark.py @@ -88,20 +88,21 @@ class Benchmark: tex_file.write("\\multicolumn{{8}}{{|c|}}{{{} ({})}}\\\\\n".format(model, first_log.model["face_count"])) tex_file.write("Method & Parameter & \\#VPC & \\#Discarded & \\#OVP & RT[S] & NBV[s] & coverage \\\\\n") for approach in self.methods_per_approach: - logs_per_approach = self.log_container_per_model[model].get_logs_by_approach(approach) - if len(logs_per_approach) == 0: - continue + for method in self.methods_per_approach[approach]: + logs_per_method = self.log_container_per_model[model].get_logs_by_method(method) + if len(logs_per_method) == 0: + continue - for log in logs_per_approach: - tex_file.write("{} & {} & {} & {} & {} & {} & {} & {} \\\\\n".format( - log.VPC["method"], - log.VPC["generation_parameter"], - log.VPC["count"] + log.VPC["discarded_count"], - log.VPC["discarded_count"], - len(log.optimization["OVP"]), - util.set_precision(log.timing["visibility_matrix_sec"], 2), - util.set_precision(log.timing["optimization_sec"], 2), - util.set_precision(log.coverage["percent_fraction"], 2))) + for log in logs_per_method: + tex_file.write("{} & {} & {} & {} & {} & {} & {} & {} \\\\\n".format( + log.VPC["method"], + log.VPC["generation_parameter"], + log.VPC["count"] + log.VPC["discarded_count"], + log.VPC["discarded_count"], + len(log.optimization["OVP"]), + util.set_precision(log.timing["visibility_matrix_sec"], 2), + util.set_precision(log.timing["optimization_sec"], 2), + util.set_precision(log.coverage["percent_fraction"], 2))) tex_file.write("\\hline\n") tex_file.write("\\end{longtable}\n") diff --git a/ovp_paths.json b/ovp_paths.json index d685dd48ddfc75e701b5955a748dca4a11082868..4bf18b5e524d91896a04bd4b90505b021f610c17 100644 --- a/ovp_paths.json +++ b/ovp_paths.json @@ -1,6 +1,3 @@ [ - "/home/pastrva/Projects/VirtualImageProcessing/Fileserver/Papers/2020_Generate_and_Test_Comparison/Results/WithFiltering/face_shield", - "/home/pastrva/Projects/VirtualImageProcessing/Fileserver/Papers/2020_Generate_and_Test_Comparison/Results/WithFiltering/cumulative_opt_results2.txt", - "/home/pastrva/Projects/VirtualImageProcessing/Fileserver/Papers/2020_Generate_and_Test_Comparison/Results/WithFiltering/gear--10--OVP--UniformSphere--0.000000_coverage_2020-04-25_01-27-59_gear--sphere-centroid--VPC--10_generated_positions_2020-04-24_21-27-21_log.json", - "/home/pastrva/Projects/VirtualImageProcessing/Fileserver/Papers/2020_Generate_and_Test_Comparison/Results/WithFiltering/gear--10--OVP--UniformSphereAvgBbox--0.065327_coverage_2020-04-27_20-17-18_gear--sphere_avg_bbox-centroid--VPC--10_generated_positions_2020-04-27_17-15-45_log.json" + "/home/pastrva/Projects/VirtualImageProcessing/Fileserver/Papers/2020_Generate_and_Test_Comparison/Results/WithFiltering/face_shield" ]