From 25c0e8e35878c997c7aba87708a38a54d3bf9b47 Mon Sep 17 00:00:00 2001 From: Si11ium Date: Wed, 8 Apr 2020 12:04:04 +0200 Subject: [PATCH] Refactoring --- {lib/models => datasets}/__init__.py | 0 .../preprocessing}/__init__.py | 0 {lib => datasets}/preprocessing/generator.py | 0 .../generator_eval.py => generator_eval.py | 0 lib/evaluation/homotopic.py | 21 ------------------- .../__init__.py | 0 {lib/objects => models}/__init__.py | 0 .../generators}/__init__.py | 0 {lib/models => models}/generators/cnn.py | 0 .../generators/cnn_discriminated.py | 0 {lib/models => models}/generators/full.py | 0 .../models => models}/generators/recurrent.py | 0 .../homotopy_classification/__init__.py | 0 .../homotopy_classification/cnn_based.py | 0 objects/__init__.py | 0 {lib/objects => objects}/map.py | 0 {lib/objects => objects}/trajectory.py | 0 17 files changed, 21 deletions(-) rename {lib/models => datasets}/__init__.py (100%) rename {lib/models/generators => datasets/preprocessing}/__init__.py (100%) rename {lib => datasets}/preprocessing/generator.py (100%) rename lib/visualization/generator_eval.py => generator_eval.py (100%) delete mode 100644 lib/evaluation/homotopic.py rename lib/{models/homotopy_classification => examples}/__init__.py (100%) rename {lib/objects => models}/__init__.py (100%) rename {lib/preprocessing => models/generators}/__init__.py (100%) rename {lib/models => models}/generators/cnn.py (100%) rename {lib/models => models}/generators/cnn_discriminated.py (100%) rename {lib/models => models}/generators/full.py (100%) rename {lib/models => models}/generators/recurrent.py (100%) rename lib/visualization/bars.py => models/homotopy_classification/__init__.py (100%) rename {lib/models => models}/homotopy_classification/cnn_based.py (100%) create mode 100644 objects/__init__.py rename {lib/objects => objects}/map.py (100%) rename {lib/objects => objects}/trajectory.py (100%) diff --git a/lib/models/__init__.py b/datasets/__init__.py similarity index 100% rename from lib/models/__init__.py rename to datasets/__init__.py diff --git a/lib/models/generators/__init__.py b/datasets/preprocessing/__init__.py similarity index 100% rename from lib/models/generators/__init__.py rename to datasets/preprocessing/__init__.py diff --git a/lib/preprocessing/generator.py b/datasets/preprocessing/generator.py similarity index 100% rename from lib/preprocessing/generator.py rename to datasets/preprocessing/generator.py diff --git a/lib/visualization/generator_eval.py b/generator_eval.py similarity index 100% rename from lib/visualization/generator_eval.py rename to generator_eval.py diff --git a/lib/evaluation/homotopic.py b/lib/evaluation/homotopic.py deleted file mode 100644 index bf5bc14..0000000 --- a/lib/evaluation/homotopic.py +++ /dev/null @@ -1,21 +0,0 @@ -from PIL import ImageDraw -from PIL import Image - -import numpy as np - - -def are_homotopic(map_array, trajectory, other_trajectory): - - polyline = trajectory.vertices.copy() - polyline.extend(reversed(other_trajectory.vertices)) - - height, width = map_array.shape - - img = Image.new('L', (height, width), 0) - ImageDraw.Draw(img).polygon(polyline, outline=1, fill=1) - - a = (np.array(img) * map_array).sum() - if a >= 1: - return False - else: - return True diff --git a/lib/models/homotopy_classification/__init__.py b/lib/examples/__init__.py similarity index 100% rename from lib/models/homotopy_classification/__init__.py rename to lib/examples/__init__.py diff --git a/lib/objects/__init__.py b/models/__init__.py similarity index 100% rename from lib/objects/__init__.py rename to models/__init__.py diff --git a/lib/preprocessing/__init__.py b/models/generators/__init__.py similarity index 100% rename from lib/preprocessing/__init__.py rename to models/generators/__init__.py diff --git a/lib/models/generators/cnn.py b/models/generators/cnn.py similarity index 100% rename from lib/models/generators/cnn.py rename to models/generators/cnn.py diff --git a/lib/models/generators/cnn_discriminated.py b/models/generators/cnn_discriminated.py similarity index 100% rename from lib/models/generators/cnn_discriminated.py rename to models/generators/cnn_discriminated.py diff --git a/lib/models/generators/full.py b/models/generators/full.py similarity index 100% rename from lib/models/generators/full.py rename to models/generators/full.py diff --git a/lib/models/generators/recurrent.py b/models/generators/recurrent.py similarity index 100% rename from lib/models/generators/recurrent.py rename to models/generators/recurrent.py diff --git a/lib/visualization/bars.py b/models/homotopy_classification/__init__.py similarity index 100% rename from lib/visualization/bars.py rename to models/homotopy_classification/__init__.py diff --git a/lib/models/homotopy_classification/cnn_based.py b/models/homotopy_classification/cnn_based.py similarity index 100% rename from lib/models/homotopy_classification/cnn_based.py rename to models/homotopy_classification/cnn_based.py diff --git a/objects/__init__.py b/objects/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/lib/objects/map.py b/objects/map.py similarity index 100% rename from lib/objects/map.py rename to objects/map.py diff --git a/lib/objects/trajectory.py b/objects/trajectory.py similarity index 100% rename from lib/objects/trajectory.py rename to objects/trajectory.py