Solved conflict

scumatteo · Jan 28, 2021 · 4453883 · 4453883
2 parents 4bd085c + 2d8c952
commit 4453883
Show file tree

Hide file tree

Showing 17 changed files with 2 additions and 2 deletions.
diff --git a/media/EfficientNetB0.png b/media/EfficientNetB0.png
diff --git a/media/EfficientNetB3.png b/media/EfficientNetB3.png
diff --git a/media/InceptionResNetV2.png b/media/InceptionResNetV2.png
diff --git a/media/InceptionV3.png b/media/InceptionV3.png
diff --git a/media/MobileNet.png b/media/MobileNet.png
diff --git a/media/MobileNetV2.png b/media/MobileNetV2.png
diff --git a/media/ResNet50.png b/media/ResNet50.png
diff --git a/media/ResNet50V2.png b/media/ResNet50V2.png
diff --git a/media/Xception.png b/media/Xception.png
diff --git a/...ication/confusion_matrix_visualization.py → src/confusion_matrix_visualization.py b/...ication/confusion_matrix_visualization.py → src/confusion_matrix_visualization.py
diff --git a/src/classification/feature_visualization.py → src/feature_visualization.py b/src/classification/feature_visualization.py → src/feature_visualization.py
diff --git a/src/classification/heatmap_visualization.py → src/heatmap_visualization.py b/src/classification/heatmap_visualization.py → src/heatmap_visualization.py
@@ -80,9 +80,9 @@ def __overlay_gradCAM(img, cam3):
 def __vis_heatmap(cam, cam3, heatmap):
     fig, ax = plt.subplots(1, 3, figsize=(15,15))
     ax[0].imshow(cam)
-    ax[0].set_title("HeatMap")
+    ax[0].set_title("Cam")
     ax[1].imshow(cam3)
-    ax[1].set_title("HeatMap Relu")
+    ax[1].set_title("Cam Relu")
     ax[2].imshow(heatmap[0])
     ax[2].set_title("Image with HeatMap")
     plt.tight_layout()

diff --git a/src/classification/history_visualization.py → src/history_visualization.py b/src/classification/history_visualization.py → src/history_visualization.py
diff --git a/src/classification/image_utilities.py → src/image_utilities.py b/src/classification/image_utilities.py → src/image_utilities.py
diff --git a/src/classification/kernel_visualization.py → src/kernel_visualization.py b/src/classification/kernel_visualization.py → src/kernel_visualization.py
diff --git a/src/segmentation/utility.py → src/segmentation_utility.py b/src/segmentation/utility.py → src/segmentation_utility.py
diff --git a/src/classification/user_interaction.py → src/user_interaction.py b/src/classification/user_interaction.py → src/user_interaction.py