diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp new file mode 100644 index 0000000000000000000000000000000000000000..a7bfb2481d9bbf2ee1bc96309e3f4ced5192d9e1 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/Group5_P3_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp @@ -0,0 +1,4 @@ +n [rpm], T_drive [Nm] +0,1200 +600, 0 +3000, 0 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp new file mode 100644 index 0000000000000000000000000000000000000000..a7bfb2481d9bbf2ee1bc96309e3f4ced5192d9e1 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/P_HEV/P4_APT/Vehicle/VehicleMaxPropulsionTorque.vtqp @@ -0,0 +1,4 @@ +n [rpm], T_drive [Nm] +0,1200 +600, 0 +3000, 0 \ No newline at end of file diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_1_i=3-49.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_1_i=3-49.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..5e25d590800c006073435dc6f634f14e0848cbb4 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_1_i=3-49.vtlm @@ -0,0 +1,202 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,56 +0,400,64 +0,600,72 +0,900,84 +0,1200,96 +0,1600,112 +0,2000,128 +0,2500,148 +600,0,48 +600,200,56 +600,400,64 +600,600,72 +600,900,84 +600,1200,96 +600,1600,112 +600,2000,128 +600,2500,148 +900,0,57 +900,200,65 +900,400,73 +900,600,81 +900,900,93 +900,1200,105 +900,1600,121 +900,2000,137 +900,2500,157 +1200,0,66 +1200,200,74 +1200,400,82 +1200,600,90 +1200,900,102 +1200,1200,114 +1200,1600,130 +1200,2000,146 +1200,2500,166 +1600,0,78 +1600,200,86 +1600,400,94 +1600,600,102 +1600,900,114 +1600,1200,126 +1600,1600,142 +1600,2000,158 +1600,2500,178 +2000,0,90 +2000,200,98 +2000,400,106 +2000,600,114 +2000,900,126 +2000,1200,138 +2000,1600,154 +2000,2000,170 +2000,2500,190 +2500,0,105 +2500,200,113 +2500,400,121 +2500,600,129 +2500,900,141 +2500,1200,153 +2500,1600,169 +2500,2000,185 +2500,2500,205 +3000,0,120 +3000,200,128 +3000,400,136 +3000,600,144 +3000,900,156 +3000,1200,168 +3000,1600,184 +3000,2000,200 +3000,2500,220 +600,0,48 +600,-200,56 +600,-400,64 +600,-600,72 +600,-900,84 +600,-1200,96 +600,-1600,112 +600,-2000,128 +600,-2500,148 +900,0,57 +900,-200,65 +900,-400,73 +900,-600,81 +900,-900,93 +900,-1200,105 +900,-1600,121 +900,-2000,137 +900,-2500,157 +1200,0,66 +1200,-200,74 +1200,-400,82 +1200,-600,90 +1200,-900,102 +1200,-1200,114 +1200,-1600,130 +1200,-2000,146 +1200,-2500,166 +1600,0,78 +1600,-200,86 +1600,-400,94 +1600,-600,102 +1600,-900,114 +1600,-1200,126 +1600,-1600,142 +1600,-2000,158 +1600,-2500,178 +2000,0,90 +2000,-200,98 +2000,-400,106 +2000,-600,114 +2000,-900,126 +2000,-1200,138 +2000,-1600,154 +2000,-2000,170 +2000,-2500,190 +2500,0,105 +2500,-200,113 +2500,-400,121 +2500,-600,129 +2500,-900,141 +2500,-1200,153 +2500,-1600,169 +2500,-2000,185 +2500,-2500,205 +3000,0,120 +3000,-200,128 +3000,-400,136 +3000,-600,144 +3000,-900,156 +3000,-1200,168 +3000,-1600,184 +3000,-2000,200 +3000,-2500,220 +1300,2610,66 +1300,2842,71 +1500,-812,46 +1500,-348,37 +1500,0,13 +1500,58,16 +1500,290,21 +1500,522,26 +1500,754,30 +1500,986,35 +1500,1218,39 +1500,1450,44 +1500,1682,49 +1500,1914,53 +1500,2146,58 +1500,2378,63 +1500,2610,67 +1500,2842,72 +1700,-812,49 +1700,-348,39 +1700,0,14 +1700,58,17 +1700,290,22 +1700,522,27 +1700,754,31 +1700,986,36 +1700,1218,41 +1700,1450,45 +1700,1682,50 +1700,1914,55 +1700,2146,59 +1700,2378,64 +1700,2610,68 +1700,2842,73 +1900,-812,51 +1900,-348,42 +1900,0,15 +1900,58,19 +1900,290,23 +1900,522,28 +1900,754,32 +1900,986,37 +1900,1218,42 +1900,1450,46 +1900,1682,51 +1900,1914,56 +1900,2146,60 +1900,2378,65 +1900,2610,70 +1900,2842,74 +2100,-812,53 +2100,-348,44 +2100,0,16 +2100,58,20 +2100,290,24 +2100,522,29 +2100,754,34 +2100,986,38 +2100,1218,43 +2100,1450,48 +2100,1682,52 +2100,1914,57 +2100,2146,61 +2100,2378,66 +2100,2610,71 +2100,2842,75 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_2_i=1-86.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_2_i=1-86.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..1cdc06160aa4dcdfe6fcf5775fc18e4c5fa943ff --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_2_i=1-86.vtlm @@ -0,0 +1,136 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,56 +0,400,64 +0,600,72 +0,900,84 +0,1200,96 +0,1600,112 +0,2000,128 +0,2500,148 +600,0,48 +600,200,56 +600,400,64 +600,600,72 +600,900,84 +600,1200,96 +600,1600,112 +600,2000,128 +600,2500,148 +900,0,57 +900,200,65 +900,400,73 +900,600,81 +900,900,93 +900,1200,105 +900,1600,121 +900,2000,137 +900,2500,157 +1200,0,66 +1200,200,74 +1200,400,82 +1200,600,90 +1200,900,102 +1200,1200,114 +1200,1600,130 +1200,2000,146 +1200,2500,166 +1600,0,78 +1600,200,86 +1600,400,94 +1600,600,102 +1600,900,114 +1600,1200,126 +1600,1600,142 +1600,2000,158 +1600,2500,178 +2000,0,90 +2000,200,98 +2000,400,106 +2000,600,114 +2000,900,126 +2000,1200,138 +2000,1600,154 +2000,2000,170 +2000,2500,190 +2500,0,105 +2500,200,113 +2500,400,121 +2500,600,129 +2500,900,141 +2500,1200,153 +2500,1600,169 +2500,2000,185 +2500,2500,205 +3000,0,120 +3000,200,128 +3000,400,136 +3000,600,144 +3000,900,156 +3000,1200,168 +3000,1600,184 +3000,2000,200 +3000,2500,220 +600,0,48 +600,-200,56 +600,-400,64 +600,-600,72 +600,-900,84 +600,-1200,96 +600,-1600,112 +600,-2000,128 +600,-2500,148 +900,0,57 +900,-200,65 +900,-400,73 +900,-600,81 +900,-900,93 +900,-1200,105 +900,-1600,121 +900,-2000,137 +900,-2500,157 +1200,0,66 +1200,-200,74 +1200,-400,82 +1200,-600,90 +1200,-900,102 +1200,-1200,114 +1200,-1600,130 +1200,-2000,146 +1200,-2500,166 +1600,0,78 +1600,-200,86 +1600,-400,94 +1600,-600,102 +1600,-900,114 +1600,-1200,126 +1600,-1600,142 +1600,-2000,158 +1600,-2500,178 +2000,0,90 +2000,-200,98 +2000,-400,106 +2000,-600,114 +2000,-900,126 +2000,-1200,138 +2000,-1600,154 +2000,-2000,170 +2000,-2500,190 +2500,0,105 +2500,-200,113 +2500,-400,121 +2500,-600,129 +2500,-900,141 +2500,-1200,153 +2500,-1600,169 +2500,-2000,185 +2500,-2500,205 +3000,0,120 +3000,-200,128 +3000,-400,136 +3000,-600,144 +3000,-900,156 +3000,-1200,168 +3000,-1600,184 +3000,-2000,200 +3000,-2500,220 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_3_i=1-41.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_3_i=1-41.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..1cdc06160aa4dcdfe6fcf5775fc18e4c5fa943ff --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_3_i=1-41.vtlm @@ -0,0 +1,136 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,56 +0,400,64 +0,600,72 +0,900,84 +0,1200,96 +0,1600,112 +0,2000,128 +0,2500,148 +600,0,48 +600,200,56 +600,400,64 +600,600,72 +600,900,84 +600,1200,96 +600,1600,112 +600,2000,128 +600,2500,148 +900,0,57 +900,200,65 +900,400,73 +900,600,81 +900,900,93 +900,1200,105 +900,1600,121 +900,2000,137 +900,2500,157 +1200,0,66 +1200,200,74 +1200,400,82 +1200,600,90 +1200,900,102 +1200,1200,114 +1200,1600,130 +1200,2000,146 +1200,2500,166 +1600,0,78 +1600,200,86 +1600,400,94 +1600,600,102 +1600,900,114 +1600,1200,126 +1600,1600,142 +1600,2000,158 +1600,2500,178 +2000,0,90 +2000,200,98 +2000,400,106 +2000,600,114 +2000,900,126 +2000,1200,138 +2000,1600,154 +2000,2000,170 +2000,2500,190 +2500,0,105 +2500,200,113 +2500,400,121 +2500,600,129 +2500,900,141 +2500,1200,153 +2500,1600,169 +2500,2000,185 +2500,2500,205 +3000,0,120 +3000,200,128 +3000,400,136 +3000,600,144 +3000,900,156 +3000,1200,168 +3000,1600,184 +3000,2000,200 +3000,2500,220 +600,0,48 +600,-200,56 +600,-400,64 +600,-600,72 +600,-900,84 +600,-1200,96 +600,-1600,112 +600,-2000,128 +600,-2500,148 +900,0,57 +900,-200,65 +900,-400,73 +900,-600,81 +900,-900,93 +900,-1200,105 +900,-1600,121 +900,-2000,137 +900,-2500,157 +1200,0,66 +1200,-200,74 +1200,-400,82 +1200,-600,90 +1200,-900,102 +1200,-1200,114 +1200,-1600,130 +1200,-2000,146 +1200,-2500,166 +1600,0,78 +1600,-200,86 +1600,-400,94 +1600,-600,102 +1600,-900,114 +1600,-1200,126 +1600,-1600,142 +1600,-2000,158 +1600,-2500,178 +2000,0,90 +2000,-200,98 +2000,-400,106 +2000,-600,114 +2000,-900,126 +2000,-1200,138 +2000,-1600,154 +2000,-2000,170 +2000,-2500,190 +2500,0,105 +2500,-200,113 +2500,-400,121 +2500,-600,129 +2500,-900,141 +2500,-1200,153 +2500,-1600,169 +2500,-2000,185 +2500,-2500,205 +3000,0,120 +3000,-200,128 +3000,-400,136 +3000,-600,144 +3000,-900,156 +3000,-1200,168 +3000,-1600,184 +3000,-2000,200 +3000,-2500,220 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_4_i=1.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_4_i=1.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..36365e666f12b3e1f9083aaf6dc653069c1e92f3 --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_4_i=1.vtlm @@ -0,0 +1,136 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,50 +0,400,52 +0,600,54 +0,900,57 +0,1200,60 +0,1600,64 +0,2000,68 +0,2500,73 +600,0,48 +600,200,50 +600,400,52 +600,600,54 +600,900,57 +600,1200,60 +600,1600,64 +600,2000,68 +600,2500,73 +900,0,57 +900,200,59 +900,400,61 +900,600,63 +900,900,66 +900,1200,69 +900,1600,73 +900,2000,77 +900,2500,82 +1200,0,66 +1200,200,68 +1200,400,70 +1200,600,72 +1200,900,75 +1200,1200,78 +1200,1600,82 +1200,2000,86 +1200,2500,91 +1600,0,78 +1600,200,80 +1600,400,82 +1600,600,84 +1600,900,87 +1600,1200,90 +1600,1600,94 +1600,2000,98 +1600,2500,103 +2000,0,90 +2000,200,92 +2000,400,94 +2000,600,96 +2000,900,99 +2000,1200,102 +2000,1600,106 +2000,2000,110 +2000,2500,115 +2500,0,105 +2500,200,107 +2500,400,109 +2500,600,111 +2500,900,114 +2500,1200,117 +2500,1600,121 +2500,2000,125 +2500,2500,130 +3000,0,120 +3000,200,122 +3000,400,124 +3000,600,126 +3000,900,129 +3000,1200,132 +3000,1600,136 +3000,2000,140 +3000,2500,145 +600,0,48 +600,-200,50 +600,-400,52 +600,-600,54 +600,-900,57 +600,-1200,60 +600,-1600,64 +600,-2000,68 +600,-2500,73 +900,0,57 +900,-200,59 +900,-400,61 +900,-600,63 +900,-900,66 +900,-1200,69 +900,-1600,73 +900,-2000,77 +900,-2500,82 +1200,0,66 +1200,-200,68 +1200,-400,70 +1200,-600,72 +1200,-900,75 +1200,-1200,78 +1200,-1600,82 +1200,-2000,86 +1200,-2500,91 +1600,0,78 +1600,-200,80 +1600,-400,82 +1600,-600,84 +1600,-900,87 +1600,-1200,90 +1600,-1600,94 +1600,-2000,98 +1600,-2500,103 +2000,0,90 +2000,-200,92 +2000,-400,94 +2000,-600,96 +2000,-900,99 +2000,-1200,102 +2000,-1600,106 +2000,-2000,110 +2000,-2500,115 +2500,0,105 +2500,-200,107 +2500,-400,109 +2500,-600,111 +2500,-900,114 +2500,-1200,117 +2500,-1600,121 +2500,-2000,125 +2500,-2500,130 +3000,0,120 +3000,-200,122 +3000,-400,124 +3000,-600,126 +3000,-900,129 +3000,-1200,132 +3000,-1600,136 +3000,-2000,140 +3000,-2500,145 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_5_i=0-75.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_5_i=0-75.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..1cdc06160aa4dcdfe6fcf5775fc18e4c5fa943ff --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_5_i=0-75.vtlm @@ -0,0 +1,136 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,56 +0,400,64 +0,600,72 +0,900,84 +0,1200,96 +0,1600,112 +0,2000,128 +0,2500,148 +600,0,48 +600,200,56 +600,400,64 +600,600,72 +600,900,84 +600,1200,96 +600,1600,112 +600,2000,128 +600,2500,148 +900,0,57 +900,200,65 +900,400,73 +900,600,81 +900,900,93 +900,1200,105 +900,1600,121 +900,2000,137 +900,2500,157 +1200,0,66 +1200,200,74 +1200,400,82 +1200,600,90 +1200,900,102 +1200,1200,114 +1200,1600,130 +1200,2000,146 +1200,2500,166 +1600,0,78 +1600,200,86 +1600,400,94 +1600,600,102 +1600,900,114 +1600,1200,126 +1600,1600,142 +1600,2000,158 +1600,2500,178 +2000,0,90 +2000,200,98 +2000,400,106 +2000,600,114 +2000,900,126 +2000,1200,138 +2000,1600,154 +2000,2000,170 +2000,2500,190 +2500,0,105 +2500,200,113 +2500,400,121 +2500,600,129 +2500,900,141 +2500,1200,153 +2500,1600,169 +2500,2000,185 +2500,2500,205 +3000,0,120 +3000,200,128 +3000,400,136 +3000,600,144 +3000,900,156 +3000,1200,168 +3000,1600,184 +3000,2000,200 +3000,2500,220 +600,0,48 +600,-200,56 +600,-400,64 +600,-600,72 +600,-900,84 +600,-1200,96 +600,-1600,112 +600,-2000,128 +600,-2500,148 +900,0,57 +900,-200,65 +900,-400,73 +900,-600,81 +900,-900,93 +900,-1200,105 +900,-1600,121 +900,-2000,137 +900,-2500,157 +1200,0,66 +1200,-200,74 +1200,-400,82 +1200,-600,90 +1200,-900,102 +1200,-1200,114 +1200,-1600,130 +1200,-2000,146 +1200,-2500,166 +1600,0,78 +1600,-200,86 +1600,-400,94 +1600,-600,102 +1600,-900,114 +1600,-1200,126 +1600,-1600,142 +1600,-2000,158 +1600,-2500,178 +2000,0,90 +2000,-200,98 +2000,-400,106 +2000,-600,114 +2000,-900,126 +2000,-1200,138 +2000,-1600,154 +2000,-2000,170 +2000,-2500,190 +2500,0,105 +2500,-200,113 +2500,-400,121 +2500,-600,129 +2500,-900,141 +2500,-1200,153 +2500,-1600,169 +2500,-2000,185 +2500,-2500,205 +3000,0,120 +3000,-200,128 +3000,-400,136 +3000,-600,144 +3000,-900,156 +3000,-1200,168 +3000,-1600,184 +3000,-2000,200 +3000,-2500,220 diff --git a/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_6_i=0-65.vtlm b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_6_i=0-65.vtlm new file mode 100644 index 0000000000000000000000000000000000000000..1cdc06160aa4dcdfe6fcf5775fc18e4c5fa943ff --- /dev/null +++ b/VectoCore/VectoCoreTest/TestData/Integration/DeclarationMode/2nd_AmendmDeclMode/JSON/S_HEV/GenericVehicle_S2_AT/Gear_6_i=0-65.vtlm @@ -0,0 +1,136 @@ +Input Speed [1/min], Input Torque [Nm], Torque Loss [Nm] +0,0,48 +0,200,56 +0,400,64 +0,600,72 +0,900,84 +0,1200,96 +0,1600,112 +0,2000,128 +0,2500,148 +600,0,48 +600,200,56 +600,400,64 +600,600,72 +600,900,84 +600,1200,96 +600,1600,112 +600,2000,128 +600,2500,148 +900,0,57 +900,200,65 +900,400,73 +900,600,81 +900,900,93 +900,1200,105 +900,1600,121 +900,2000,137 +900,2500,157 +1200,0,66 +1200,200,74 +1200,400,82 +1200,600,90 +1200,900,102 +1200,1200,114 +1200,1600,130 +1200,2000,146 +1200,2500,166 +1600,0,78 +1600,200,86 +1600,400,94 +1600,600,102 +1600,900,114 +1600,1200,126 +1600,1600,142 +1600,2000,158 +1600,2500,178 +2000,0,90 +2000,200,98 +2000,400,106 +2000,600,114 +2000,900,126 +2000,1200,138 +2000,1600,154 +2000,2000,170 +2000,2500,190 +2500,0,105 +2500,200,113 +2500,400,121 +2500,600,129 +2500,900,141 +2500,1200,153 +2500,1600,169 +2500,2000,185 +2500,2500,205 +3000,0,120 +3000,200,128 +3000,400,136 +3000,600,144 +3000,900,156 +3000,1200,168 +3000,1600,184 +3000,2000,200 +3000,2500,220 +600,0,48 +600,-200,56 +600,-400,64 +600,-600,72 +600,-900,84 +600,-1200,96 +600,-1600,112 +600,-2000,128 +600,-2500,148 +900,0,57 +900,-200,65 +900,-400,73 +900,-600,81 +900,-900,93 +900,-1200,105 +900,-1600,121 +900,-2000,137 +900,-2500,157 +1200,0,66 +1200,-200,74 +1200,-400,82 +1200,-600,90 +1200,-900,102 +1200,-1200,114 +1200,-1600,130 +1200,-2000,146 +1200,-2500,166 +1600,0,78 +1600,-200,86 +1600,-400,94 +1600,-600,102 +1600,-900,114 +1600,-1200,126 +1600,-1600,142 +1600,-2000,158 +1600,-2500,178 +2000,0,90 +2000,-200,98 +2000,-400,106 +2000,-600,114 +2000,-900,126 +2000,-1200,138 +2000,-1600,154 +2000,-2000,170 +2000,-2500,190 +2500,0,105 +2500,-200,113 +2500,-400,121 +2500,-600,129 +2500,-900,141 +2500,-1200,153 +2500,-1600,169 +2500,-2000,185 +2500,-2500,205 +3000,0,120 +3000,-200,128 +3000,-400,136 +3000,-600,144 +3000,-900,156 +3000,-1200,168 +3000,-1600,184 +3000,-2000,200 +3000,-2500,220