correct test cases, add case files

maro/simulator/tests/data/ecr/case_01/order.csv

@@ -0,0 +1 @@
+tick, source, target, order_number

maro/simulator/tests/data/ecr/case_01/route.csv

@@ -0,0 +1,7 @@
+vsl_id,arrival,departure,port
+0,0,2,0
+0,8,11,1
+0,13,20,2
+0,22,30,0
+1,0,2,1
+1,10,20,2

maro/simulator/tests/data/ecr/case_02/order.csv

@@ -0,0 +1,4 @@
+tick, source, target, order_number
+0,0,1,10
+3,0,2,40
+7,0,1,51

maro/simulator/tests/data/ecr/case_02/ports.csv

@@ -0,0 +1,4 @@
+port_id,capacity,init_cntr
+0,1000,100
+1,1000,0
+2,1000,0

maro/simulator/tests/data/ecr/case_02/route.csv

@@ -0,0 +1,5 @@
+vsl_id,arrival,departure,port
+0,2,0,0
+0,8,11,1
+1,12,0,0
+1,18,11,1

maro/simulator/tests/data/ecr/case_03/order.csv

@@ -0,0 +1,3 @@
+tick, source, target, order_number
+0,0,1,10
+3,0,1,40

maro/simulator/tests/data/ecr/case_03/ports.csv

@@ -0,0 +1,4 @@
+port_id,capacity,init_cntr
+0,1000,100
+1,1000,0
+2,1000,0

maro/simulator/tests/data/ecr/case_03/route.csv

@@ -0,0 +1,13 @@
+vsl_id,arrival,departure,port
+0,0,2,1
+0,5,6,0
+0,10,12,1
+0,18,20,0
+0,24,25,1
+0,28,30,0
+1,100,2,1
+1,105,6,0
+1,1010,12,1
+1,1018,20,0
+1,1024,25,1
+1,1028,30,0

maro/simulator/tests/data/ecr/case_03/vessels.csv

@@ -0,0 +1,3 @@
+vessel_id,capacity,empty
+0,100,0
+1,100,0

maro/simulator/tests/data/ecr/case_04/order.csv

@@ -0,0 +1,4 @@
+tick, source, target, order_number
+0,0,1,10
+3,0,1,40
+3,2,1,50

maro/simulator/tests/data/ecr/case_04/ports.csv

@@ -0,0 +1,4 @@
+port_id,capacity,init_cntr
+0,1000,50
+1,1000,0
+2,1000,50

maro/simulator/tests/data/ecr/case_04/route.csv

@@ -0,0 +1,13 @@
+vsl_id,arrival,departure,port
+0,0,2,1
+0,5,6,0
+0,10,12,2
+0,18,20,1
+0,24,25,0
+0,28,30,2
+1,100,2,1
+1,105,6,0
+1,110,12,2
+1,118,20,1
+1,124,25,0
+1,128,30,2

maro/simulator/tests/data/ecr/case_04/vessels.csv

@@ -0,0 +1,3 @@
+vessel_id,capacity,empty
+0,100,10
+1,100,0

maro/simulator/tests/show_data_generator.py

@@ -1,129 +0,0 @@
-# Copyright (c) Microsoft Corporation.
-# Licensed under the MIT license.
-
-
-# this script used to show a chart for specified order config
-import sys, getopt
-import numpy as np
-import matplotlib.pyplot as plt
-from yaml import safe_load
-
-from maro.simulator.scenarios.ecr.ecr_data_generator import GlobalOrderProportion, EcrDataGenerator
-
-
-def create_gop(config_yml_path, max_tick):
-    with open(config_yml_path, "r") as fp:
-        config = safe_load(fp)
-
-    containers = config["total_containers"]
-
-    return GlobalOrderProportion(config["container_usage_proportion"], max_tick, containers)
-
-
-def draw_period_distribution(config_yml_path, max_tick):
-    gop = create_gop(config_yml_path, max_tick)
-    period = gop.period
-
-    x = [i for i in range(period)]
-    y = [d for d in gop.order_period_distribution]
-
-    plt.plot(x, y)
-
-    plt.show()
-
-
-def draw_unpacked_distribution(config_yml_path, max_tick):
-    gop = create_gop(config_yml_path, max_tick)
-
-    x = [i for i in range(max_tick)]
-    y = [d for d in gop.order_distribution]
-
-    plt.plot(x, y)
-    plt.text(0, 0, f"total order: {gop.total_order}")
-
-    plt.show()
-
-
-def draw_spacial_distribution(config_yml_path, max_tick, save_fig=False):
-    data_generator: EcrDataGenerator = EcrDataGenerator(max_tick, config_yml_path)
-
-    port_names = list(data_generator._ports._conf.keys())
-    sorted_port_names = sorted(port_names)
-    indices = [sorted_port_names.index(name) for name in port_names]
-
-    def compress(name: str):
-        return name[-1] if name.isdigit() else name[0]
-
-    abbreviations = [''.join([compress(word) for word in name.split('_')]) for name in sorted_port_names]
-
-    order_qty_list = []
-    order_matrix = np.zeros((data_generator.port_num, data_generator.port_num))
-    for tick in range(max_tick):
-        orders = data_generator.generate_orders(tick, data_generator._container_proportion._total_container)
-        order_qty_counter = 0
-        for order in orders:
-            order_qty = order.quantity
-            order_qty_counter += order_qty
-            order_matrix[indices[order.src_port_idx]][indices[order.dest_port_idx]] += order_qty
-        order_qty_list.append(order_qty_counter)
-
-    fig, (ax0, ax1) = plt.subplots(2, 1)
-    ax0.pcolor(order_matrix, cmap='OrRd')
-    ax0.set_xticks([i + 0.5 for i in range(len(sorted_port_names))])
-    ax0.set_yticks([i + 0.5 for i in range(len(sorted_port_names))])
-    if "22p_global" not in config_yml_path:
-        for i in range(data_generator.port_num):
-            for j in range(data_generator.port_num):
-                ax0.text(i + 0.5, j + 0.5, order_matrix[j, i], horizontalalignment='center', verticalalignment='center')
-        ax0.set_xticklabels(abbreviations)
-        ax0.set_yticklabels(sorted_port_names)
-    else:
-        ax0.set_xticklabels(abbreviations, fontsize=6)
-        ax0.set_yticklabels(sorted_port_names, fontsize=6)
-    ax0.set_title('Order Matrix')
-    plt.plot(np.arange(len(order_qty_list)), order_qty_list, color='tab:red')
-    ax1.set(xlabel='tick', ylabel='order qty',
-            title='Usage Proportion Distribution')
-    fig.tight_layout()
-    if save_fig:
-        plt.savefig(config_yml_path[:-10] + "order.png")
-        plt.close()
-    else:
-        plt.show()
-
-
-def draw_all_orders(max_ticks):
-    for topology in ["4p_ssdd", "5p_ssddd", "6p_sssbdd", "22p_global"]:
-        for level in range(9):
-            config_yml_path = "../scenarios/ecr/topologies/" + topology + "_l0." + str(level) + "/config.yml"
-            print("Drawing", topology, "level", level, "...")
-            draw_spacial_distribution(config_yml_path, max_ticks, save_fig=True)
-
-
-if __name__ == "__main__":
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "ht:m:c:", ["ticks=", "mode=", "config="])
-    except getopt.GetoptError:
-        sys.exit(1)
-
-    draw_func = None
-    config_path = None
-    ticks = None
-
-    for opt, arg in opts:
-        if opt == "h":
-            print("python show_data_generator.py -t 1000 -m period/unpacked/matrix -c /path/to/config.yml")
-            sys.exit()
-        if opt in ["-m", "--mode"]:
-            if arg == "period":
-                draw_func = draw_period_distribution
-            elif arg == "unpacked":
-                draw_func = draw_unpacked_distribution
-            else:
-                draw_func = draw_spacial_distribution
-        if opt in ["-c", "--config"]:
-            config_path = arg
-        if opt in ["-t", "--ticks"]:
-            ticks = int(arg)
-
-    draw_func(config_path, ticks)

maro/simulator/tests/test_data_generator.py

@@ -66,3 +66,6 @@ class TestDataGenerator(unittest.TestCase):
 
     def test_order(self):
         pass
+
+if __name__ == "__main__":
+    unittest.main()

maro/simulator/tests/test_env.py

@@ -21,7 +21,7 @@ class TestEnv(unittest.TestCase):
     """
 
     def setUp(self) -> None:
-        self.env = Env("ecr", "5p_ssddd", 10)
+        self.env = Env("ecr", "5p_ssddd_l0.0", 10)
 
     def test_env_correct(self):
         run_to_end(self.env)