From 7765658a97db58767d3aec0ab7a09bf2db40e50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B8=D1=81=D0=B5=D0=BB=D1=91=D0=B2=20=D0=92=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2?=
 <vladislav-a-k@mail.ru>
Date: Tue, 14 May 2019 09:25:12 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=8B=20=D0=BE=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/with_typing/Bunkers.tipp         |  2 +-
 tests/with_typing/FixedOperations.tipp | 18 ++++-----
 tests/with_typing/TaskT.tipp           | 26 +++++++------
 tests/with_typing/multiTow.TIPP        | 10 ++---
 tests/with_typing/v2.tipp              | 51 ++++++++++++++------------
 5 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/tests/with_typing/Bunkers.tipp b/tests/with_typing/Bunkers.tipp
index 170c99c..0a80c1b 100644
--- a/tests/with_typing/Bunkers.tipp
+++ b/tests/with_typing/Bunkers.tipp
@@ -74,7 +74,7 @@ Final Storage State
 
 
 Task Properties
-30.0; 0
+20.0; 0
 
 
 Solution
diff --git a/tests/with_typing/FixedOperations.tipp b/tests/with_typing/FixedOperations.tipp
index ee89bbd..22407f7 100644
--- a/tests/with_typing/FixedOperations.tipp
+++ b/tests/with_typing/FixedOperations.tipp
@@ -10,7 +10,7 @@ Berths
 3; Pier 2
 
 Storages
-4; Storage 1; 0; 10000.0
+4; Storage 1; 0; 1000.0
 
 Vessel Types
 1001; Тип судна1
@@ -24,8 +24,8 @@ Loading Equipment Types
 Loading Equipments
 
 Transport Ships
-5; Ship 1; 2000.0; 1001
-6; Ship 2; 2000.0; 1001
+5; Ship 1; 200.0; 1001
+6; Ship 2; 200.0; 1001
 
 Templates
 7; mov; []; 1001; 1; 2; []; 1.0
@@ -34,8 +34,8 @@ Templates
 10; mov; []; 1001; 3; 1; []; 1.0
 11; mov; []; 1001; 2; 3; []; 1.0
 12; mov; []; 1001; 3; 2; []; 1.0
-19; loa; []; 4; 0; 1001; 2; []; 100.0; U
-20; loa; []; 4; 0; 1001; 3; []; 50.0; U
+19; loa; []; 4; 0; 1001; 2; []; 10.0; U
+20; loa; []; 4; 0; 1001; 3; []; 5.0; U
 
 21; mov; []; 1001; 1; 1; []; 3.0
 
@@ -48,15 +48,15 @@ Initial Vessel State
 Initial Storage State
 0; 5; 0.0
 0; 6; 0.0
-0; 4; 10000.0
+0; 4; 1000.0
 
 Final Vessel State
 5; 1
 6; 1
 
 Final Storage State
-0; 5; 1000.0
-0; 6; 1000.0
+0; 5; 100.0
+0; 6; 100.0
 
 
 Task Properties
@@ -66,4 +66,4 @@ Task Properties
 Solution
 18.0
 21; F; 0.0; 3.0    (5 [])
-19; F; 6.0; 3.0    (5 [])
+19; F; 6.0; 3.0    (5 [] 10)
diff --git a/tests/with_typing/TaskT.tipp b/tests/with_typing/TaskT.tipp
index deda93e..2fa835f 100644
--- a/tests/with_typing/TaskT.tipp
+++ b/tests/with_typing/TaskT.tipp
@@ -10,11 +10,13 @@ Berths
 3; Pier 2
 
 Storages
-4; Storage 1; 0; 10000.0
+4; Storage 1; 0; 1000.0
 
 Vessel Types
 1001; Тип судна1
 
+Bunker Types
+
 Bunkers
 
 Tows
@@ -24,8 +26,8 @@ Loading Equipment Types
 Loading Equipments
 
 Transport Ships
-5; Ship 1; 2000.0; 1001
-6; Ship 2; 2000.0; 1001
+5; Ship 1; 200.0; 1001
+6; Ship 2; 200.0; 1001
 
 Templates
 7; mov; []; 1001; 1; 2; []; 1.0
@@ -34,8 +36,8 @@ Templates
 10; mov; []; 1001; 3; 1; []; 1.0
 11; mov; []; 1001; 2; 3; []; 1.0
 12; mov; []; 1001; 3; 2; []; 1.0
-19; loa; []; 4; 0; 1001; 2; []; 100.0; U
-20; loa; []; 4; 0; 1001; 3; []; 50.0; U
+19; loa; []; 4; 0; 1001; 2; []; 10.0; U
+20; loa; []; 4; 0; 1001; 3; []; 5.0; U
 
 Cargo Flows
 
@@ -46,15 +48,15 @@ Initial Vessel State
 Initial Storage State
 0; 5; 0.0
 0; 6; 0.0
-0; 4; 10000.0
+0; 4; 1000.0
 
 Final Vessel State
 5; 1
 6; 1
 
 Final Storage State
-0; 5; 1000.0
-0; 6; 1000.0
+0; 5; 100.0
+0; 6; 100.0
 
 
 Task Properties
@@ -65,11 +67,11 @@ Solution
 16.0
 7; R; 0.0; 1.0    (6 [])
 9; R; 0.0; 1.0    (5 [])
-19; R; 1.0; 7.0    (6 [])
-20; R; 1.0; 6.0    (5 [])
+19; R; 1.0; 7.0    (6 [] 10)
+20; R; 1.0; 6.0    (5 [] 5)
 12; R; 7.0; 1.0    (5 [])
 11; R; 8.0; 1.0    (6 [])
-19; R; 8.0; 7.0    (5 [])
-20; R; 9.0; 6.0    (6 [])
+19; R; 8.0; 7.0    (5 [] 10)
+20; R; 9.0; 6.0    (6 [] 5)
 8; R; 15.0; 1.0    (5 [])
 10; R; 15.0; 1.0    (6 [])
diff --git a/tests/with_typing/multiTow.TIPP b/tests/with_typing/multiTow.TIPP
index fc9d9f3..71441a0 100644
--- a/tests/with_typing/multiTow.TIPP
+++ b/tests/with_typing/multiTow.TIPP
@@ -9,7 +9,7 @@ Berths
 16; Терминал1
 
 Storages
-18; Хранилище1; 13; 600.0
+18; Хранилище1; 13; 6.0
 
 Vessel Types
 11; Тип судна1
@@ -38,8 +38,8 @@ Templates
 64; mov; []; 12; 16; 10; []; 1.0
 65; mrn; []; 11; 16; [12,12,12]; 1.0
 66; unm; []; 11; 16; [12,12,12]; 1.0
-67; loa; []; 11; 13; 18; 16; []; 600.0; M
-68; loa; []; 18; 13; 11; 16; []; 600.0; M
+67; loa; []; 11; 13; 18; 16; []; 6.0; M
+68; loa; []; 18; 13; 11; 16; []; 6.0; M
 
 Cargo Flows
 
@@ -52,7 +52,7 @@ Initial Vessel State
 124; 10
 
 Initial Storage State
-13; 111; 1200.0
+13; 111; 12.0
 13; 112; 0.0
 13; 18; 0.0
 
@@ -62,7 +62,7 @@ Final Vessel State
 
 Final Storage State
 13; 111; 0.0
-13; 112; 1200.0
+13; 112; 12.0
 
 
 Task Properties
diff --git a/tests/with_typing/v2.tipp b/tests/with_typing/v2.tipp
index 10f7ca4..89d6522 100644
--- a/tests/with_typing/v2.tipp
+++ b/tests/with_typing/v2.tipp
@@ -10,13 +10,15 @@ Berths
 19; Терминал2
 
 Storages
-20; Хранилище1; 22; 1000.0
-21; Хранилище2; 22; 1000.0
+20; Хранилище1; 22; 100.0
+21; Хранилище2; 22; 100.0
 
 Vessel Types
 1001; Тип судна1
 1002; Тип буксира1
 
+Bunker Types
+
 Bunkers
 
 Tows
@@ -27,8 +29,8 @@ Loading Equipment Types
 Loading Equipments
 
 Transport Ships
-24; Судно1; 1000000.0; 1001
-25; Судно2; 1000000.0; 1001
+24; Судно1; 100000.0; 1001
+25; Судно2; 100000.0; 1001
 
 Templates
 4010; mov; []; 1001; 19; 18; [1002]; 1.0
@@ -43,10 +45,10 @@ Templates
 14; mov; []; 1002; 17; 19; []; 1.0
 17; mov; []; 1002; 18; 19; []; 1.0
 13; mov; []; 1002; 17; 18; []; 1.0
-3998; loa; []; 20; 22; 1001; 18; []; 200.0; U
-3996; loa; []; 1001; 22; 20; 18; []; 200.0; U
-3994; loa; []; 21; 22; 1001; 19; []; 10.0; U
-3992; loa; []; 1001; 22; 21; 19; []; 10.0; U
+3998; loa; []; 20; 22; 1001; 18; []; 20.0; U
+3996; loa; []; 1001; 22; 20; 18; []; 20.0; U
+3994; loa; []; 21; 22; 1001; 19; []; 1.0; U
+3992; loa; []; 1001; 22; 21; 19; []; 1.0; U
 
 Cargo Flows
 
@@ -56,34 +58,35 @@ Initial Vessel State
 27; 17
 
 Initial Storage State
-22; 24; 1000.0
+22; 24; 100.0
 22; 25; 0.0
-22; 20; 200.0
-22; 21; 800.0
+22; 20; 20.0
+22; 21; 80.0
 
 Final Vessel State
 
 Final Storage State
 22; 24; 0.0
-22; 25; 1000.0
+22; 25; 100.0
 
 
 Task Properties
-22.0; 0
+16.0; 0
 
 
 Solution
 12.0
-3; R; 0.0; 5.0    (25 [])
 4005; R; 0.0; 2.0    (24 [27])
-3996; R; 2.0; 3.0    (24 [])
+15; R; 2.0; 1.0    (27 [])
+3996; R; 2.0; 3.0    (24 [] 20)
+4005; R; 3.0; 2.0    (25 [27])
 4009; R; 5.0; 1.0    (24 [27])
-3998; R; 5.0; 4.0    (25 [])
-3992; R; 6.0; 1.0    (24 [])
-3994; R; 7.0; 1.0    (24 [])
-4010; R; 8.0; 1.0    (24 [27])
-4009; R; 9.0; 1.0    (25 [27])
-3996; R; 9.0; 2.0    (24 [])
-4010; R; 10.0; 1.0    (25 [27])
-4009; R; 11.0; 1.0    (24 [27])
-3998; R; 11.0; 1.0    (25 [])
+3998; R; 5.0; 3.0    (25 [] 20)
+3992; R; 6.0; 1.0    (24 [] 1)
+4010; R; 7.0; 1.0    (24 [27])
+3996; R; 8.0; 1.0    (24 [] 20)
+4009; R; 9.0; 1.0    (24 [27])
+3998; R; 9.0; 2.0    (25 [] 20)
+4010; R; 10.0; 1.0    (24 [27])
+4009; R; 11.0; 1.0    (25 [27])
+3996; R; 11.0; 1.0    (24 [] 19)
-- 
GitLab