From e06cf925e152dac20662048e9d0af2636739fcf1 Mon Sep 17 00:00:00 2001 From: Moritz Date: Sun, 19 Jul 2020 15:15:53 +0200 Subject: [PATCH] Correct my name in all copyrights (Dederichs) and added Janos as Copyright to all files created while implementing split model (including the outputs generated from split model) --- src/inform-or/inform_or_experiments/split_model.py | 2 +- src/inform-or/inform_or_experiments/split_model_pfsp.py | 2 +- src/inform-or/inform_or_models/assign_items_by_volume.py | 1 + src/inform-or/inform_or_models/place_items_in_box.py | 1 + src/inform-or/inform_or_parser/parse_ep_solution_to_pfsp.py | 2 +- src/inform-or/inform_or_parser/parse_generated_csv.py | 4 ++-- src/inform-or/inform_or_parser/parse_split_solution_to_pfsp.py | 2 +- src/inform-or/inform_or_utility/create_packing_instructions.py | 1 + src/inform-or/inform_or_utility/draw_3D_packing_instructions.py | 2 +- src/inform-or/inform_or_utility/draw_packing_instructions.py | 5 ++--- src/inform-or/setup.py | 2 +- src/inform-runner/run_ep_heuristic.py | 2 +- 12 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/inform-or/inform_or_experiments/split_model.py b/src/inform-or/inform_or_experiments/split_model.py index a81773b..8c1d0a5 100644 --- a/src/inform-or/inform_or_experiments/split_model.py +++ b/src/inform-or/inform_or_experiments/split_model.py @@ -1,5 +1,5 @@ # Copyright (c) 2020 Janos Piddubnij -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from inform_or_models.assign_items_by_volume import assign_items_by_volume from inform_or_parser.parse_generated_csv import parse_generated_csv diff --git a/src/inform-or/inform_or_experiments/split_model_pfsp.py b/src/inform-or/inform_or_experiments/split_model_pfsp.py index 42c6090..c5a9162 100644 --- a/src/inform-or/inform_or_experiments/split_model_pfsp.py +++ b/src/inform-or/inform_or_experiments/split_model_pfsp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from inform_or_models.peak_filling_slice_push_heuristic import PeakFillingSlicePush from inform_or_models.assign_items_by_volume import assign_items_by_volume diff --git a/src/inform-or/inform_or_models/assign_items_by_volume.py b/src/inform-or/inform_or_models/assign_items_by_volume.py index 6b4c905..6e0344a 100644 --- a/src/inform-or/inform_or_models/assign_items_by_volume.py +++ b/src/inform-or/inform_or_models/assign_items_by_volume.py @@ -1,4 +1,5 @@ # Copyright (c) 2020 Moritz Dederichs +# Copyright (c) 2020 Janos Piddubnij from gurobipy import Model, GRB, quicksum from typing import Dict, Any diff --git a/src/inform-or/inform_or_models/place_items_in_box.py b/src/inform-or/inform_or_models/place_items_in_box.py index 85c0541..1b3d99b 100644 --- a/src/inform-or/inform_or_models/place_items_in_box.py +++ b/src/inform-or/inform_or_models/place_items_in_box.py @@ -1,4 +1,5 @@ # Copyright (c) 2020 Moritz Dederichs +# Copyright (c) 2020 Janos Piddubnij from gurobipy import Model, GRB, quicksum from typing import Dict, Tuple, Any diff --git a/src/inform-or/inform_or_parser/parse_ep_solution_to_pfsp.py b/src/inform-or/inform_or_parser/parse_ep_solution_to_pfsp.py index e1cdca1..81f236a 100644 --- a/src/inform-or/inform_or_parser/parse_ep_solution_to_pfsp.py +++ b/src/inform-or/inform_or_parser/parse_ep_solution_to_pfsp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from ast import literal_eval diff --git a/src/inform-or/inform_or_parser/parse_generated_csv.py b/src/inform-or/inform_or_parser/parse_generated_csv.py index 13f7d64..85dfbd3 100644 --- a/src/inform-or/inform_or_parser/parse_generated_csv.py +++ b/src/inform-or/inform_or_parser/parse_generated_csv.py @@ -1,5 +1,5 @@ -# Copyright (c) 2020 Moritz Dedderichs - +# Copyright (c) 2020 Moritz Dederichs +# Copyright (c) 2020 Janos Piddubnij import csv from typing import Tuple, Dict, Any, DefaultDict diff --git a/src/inform-or/inform_or_parser/parse_split_solution_to_pfsp.py b/src/inform-or/inform_or_parser/parse_split_solution_to_pfsp.py index 3d9dec6..a5da836 100644 --- a/src/inform-or/inform_or_parser/parse_split_solution_to_pfsp.py +++ b/src/inform-or/inform_or_parser/parse_split_solution_to_pfsp.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from ast import literal_eval diff --git a/src/inform-or/inform_or_utility/create_packing_instructions.py b/src/inform-or/inform_or_utility/create_packing_instructions.py index 1242b75..859348a 100644 --- a/src/inform-or/inform_or_utility/create_packing_instructions.py +++ b/src/inform-or/inform_or_utility/create_packing_instructions.py @@ -1,4 +1,5 @@ # Copyright (c) 2020 Moritz Dederichs +# Copyright (c) 2020 Janos Piddubnij from typing import TextIO, Tuple import os diff --git a/src/inform-or/inform_or_utility/draw_3D_packing_instructions.py b/src/inform-or/inform_or_utility/draw_3D_packing_instructions.py index 969a7c9..f23b677 100644 --- a/src/inform-or/inform_or_utility/draw_3D_packing_instructions.py +++ b/src/inform-or/inform_or_utility/draw_3D_packing_instructions.py @@ -1,5 +1,5 @@ # Copyright (c) 2020 Janos Piddubnij -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from matplotlib import pyplot as plt diff --git a/src/inform-or/inform_or_utility/draw_packing_instructions.py b/src/inform-or/inform_or_utility/draw_packing_instructions.py index 9fb775c..a1af2fd 100644 --- a/src/inform-or/inform_or_utility/draw_packing_instructions.py +++ b/src/inform-or/inform_or_utility/draw_packing_instructions.py @@ -1,6 +1,5 @@ -# Copyright (c) 2020 Moritz Dedderichs - - +# Copyright (c) 2020 Moritz Dederichs +# Copyright (c) 2020 Janos Piddubnij from matplotlib.patches import Rectangle from matplotlib import pyplot as plt diff --git a/src/inform-or/setup.py b/src/inform-or/setup.py index c154d1c..5120b14 100644 --- a/src/inform-or/setup.py +++ b/src/inform-or/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Moritz Dedderichs +# Copyright (c) 2020 Moritz Dederichs from setuptools import setup diff --git a/src/inform-runner/run_ep_heuristic.py b/src/inform-runner/run_ep_heuristic.py index ad1b985..8074fc7 100644 --- a/src/inform-runner/run_ep_heuristic.py +++ b/src/inform-runner/run_ep_heuristic.py @@ -2,7 +2,7 @@ """Module for running the EP heuristic from the runner directory.""" # Copyright (c) 2020. Yordan Manolov -# Copyright (c) 2020. Moritz Dedderichs +# Copyright (c) 2020. Moritz Dederichs import argparse import logging -- 2.11.0