diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_70_km_h.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_70_km_h.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_70_km_h.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_70_km_h.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_broken_input.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_broken_input.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_broken_input.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_broken_input.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_broken_input_2.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_broken_input_2.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_broken_input_2.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_broken_input_2.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_70_km_h.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_70_km_h.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_70_km_h.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_70_km_h.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_broken_input.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_broken_input.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_broken_input.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_broken_input.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_broken_input_2.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_broken_input_2.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_previous_v_broken_input_2.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_previous_v_broken_input_2.py diff --git a/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9.py index bce4b439..f62587e6 100644 --- a/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9.py +++ b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9.py @@ -9,7 +9,7 @@ import carla from os import path from albumentations import ( - Compose, Normalize, RandomRain, RandomBrightness, RandomShadow, RandomSnow, RandomFog, RandomSunFlare, GridDropout + Compose, Normalize, RandomRain, RandomBrightness, RandomShadow, RandomSnow, RandomFog, RandomSunFlare ) from utils.constants import PRETRAINED_MODELS_DIR, ROOT_PATH from utils.logger import logger @@ -145,15 +145,6 @@ def execute(self): bird_eye_view_1 ] - - AUGMENTATIONS_TEST = Compose([ - GridDropout(p=1.0) - ]) - - bird_eye_view_1 = AUGMENTATIONS_TEST(image=bird_eye_view_1) - bird_eye_view_1 = bird_eye_view_1["image"] - - self.update_frame('frame_1', image_1) self.update_frame('frame_2', image_2) self.update_frame('frame_3', image_3) diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_70_km_h.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_70_km_h.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_70_km_h.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_70_km_h.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input_2.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input_2.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input_2.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_previous_v_t_t-4_t-9_broken_input_2.py diff --git a/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9.py index c6ad5c06..4082712e 100644 --- a/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9.py +++ b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9.py @@ -65,7 +65,6 @@ def __init__(self, sensors, actuators, handler, model, config=None): logger.info("File " + model + " cannot be found in " + PRETRAINED_MODELS) logger.info("** Load TF model **") self.net = tf.keras.models.load_model(PRETRAINED_MODELS + model) - print(self.net.summary()) logger.info("** Loaded TF model **") else: logger.info("** Brain not loaded **") diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_70_km_h.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_70_km_h.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_70_km_h.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_70_km_h.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input.py diff --git a/behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input_2.py b/behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input_2.py similarity index 100% rename from behavior_metrics/brains/CARLA/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input_2.py rename to behavior_metrics/brains/CARLA/tensorflow/brain_carla_bird_eye_deep_learning_x3_t_t-4_t-9_broken_input_2.py