Closes #19, closes #21. Folder deepleeo created. Module datasetGen re…

…named. Tests fixed.
rvmaretto · Jun 22, 2018 · 0c1e873 · 0c1e873
1 parent fb675df
commit 0c1e873
Show file tree

Hide file tree

Showing 16 changed files with 130 additions and 219 deletions.
diff --git a/notebooks/first_classification.ipynb b/notebooks/first_classification.ipynb
@@ -0,0 +1,32 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.5.4"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/notebooks/generate_samples_one_scene.ipynb b/notebooks/generate_samples_one_scene.ipynb
diff --git a/notebooks/plot_preprocessor_results.ipynb b/notebooks/plot_preprocessor_results.ipynb
diff --git a/src/datasetGen/sampleGenerator_old.py b/src/datasetGen/sampleGenerator_old.py
diff --git a/src/datasetGen/__init__.py → src/deepleeo/__init__.py b/src/datasetGen/__init__.py → src/deepleeo/__init__.py
diff --git a/src/utils/__init__.py → src/deepleeo/dataset/__init__.py b/src/utils/__init__.py → src/deepleeo/dataset/__init__.py
diff --git a/src/datasetGen/data_augment.py → src/deepleeo/dataset/data_augment.py b/src/datasetGen/data_augment.py → src/deepleeo/dataset/data_augment.py
diff --git a/src/datasetGen/preprocessor.py → src/deepleeo/dataset/preprocessor.py b/src/datasetGen/preprocessor.py → src/deepleeo/dataset/preprocessor.py
diff --git a/src/datasetGen/rasterizer.py → src/deepleeo/dataset/rasterizer.py b/src/datasetGen/rasterizer.py → src/deepleeo/dataset/rasterizer.py
@@ -98,4 +98,4 @@ def save_labeled_raster_to_gtiff(self, path_tiff):
         output_ds.SetProjection(self.base_raster.GetProjection())
         output_ds.SetGeoTransform(self.base_raster.GetGeoTransform())
         output_band = output_ds.GetRasterBand(1)
-        output_band.WriteArray(np.ma.filled(self.labeled_raster, self.nodata_val))
+        output_band.WriteArray(np.ma.filled(self.labeled_raster[:,:,0], self.nodata_val))
diff --git a/src/datasetGen/sampleGenerator.py → src/deepleeo/dataset/sampleGenerator.py b/src/datasetGen/sampleGenerator.py → src/deepleeo/dataset/sampleGenerator.py
@@ -8,7 +8,7 @@
 from osgeo import ogr
 from osgeo import osr #TODO: Verify if it is really necessary? If I get the SRID from the Raster I still need this?
 
-sys.path.insert(0, "../")
+sys.path.insert(0, os.path.join(os.path.dirname(__file__),"../"))
 import utils.filesystem as fs
 
 class SampleGenerator(object):
@@ -69,9 +69,9 @@ def save_samples_PNG(self, path, colorMap=None, r_g_b=[1,2,3]):
             fileName = "sample" + str(pos) + ".png"
             scipy.misc.imsave(os.path.join(samplesDir, fileName), self.samples_img[pos][:, :, r_g_b])
             if(colorMap is None):
-                scipy.misc.imsave(os.path.join(labelsDir, fileName), self.samples_labels[pos])
+                scipy.misc.imsave(os.path.join(labelsDir, fileName), self.samples_labels[pos][:,:,0])
             else:
-                pl.imsave(fname=os.path.join(labelsDir, fileName), arr=self.samples_labels[pos], cmap=colorMap)
+                pl.imsave(fname=os.path.join(labelsDir, fileName), arr=self.samples_labels[pos][:,:,0], cmap=colorMap)
 
     def save_samples_NPZ(self, path, noDataValue=255):
         if os.path.exists(path):

diff --git a/src/deepleeo/utils/__init__.py b/src/deepleeo/utils/__init__.py
diff --git a/src/utils/filesystem.py → src/deepleeo/utils/filesystem.py b/src/utils/filesystem.py → src/deepleeo/utils/filesystem.py
diff --git a/src/utils/geofunctions.py → src/deepleeo/utils/geofunctions.py b/src/utils/geofunctions.py → src/deepleeo/utils/geofunctions.py
diff --git a/test/test_datasetGen/test_preprocessor.py → test/test_dataset/test_preprocessor.py b/test/test_datasetGen/test_preprocessor.py → test/test_dataset/test_preprocessor.py
@@ -4,8 +4,8 @@
 import warnings
 
 sys.path.insert(0, path.join(path.dirname(__file__),"../../src"))
-import datasetGen.preprocessor as prep
-import utils.filesystem as fs
+import deepleeo.dataset.preprocessor as prep
+import deepleeo.utils.filesystem as fs
 
 # TODO: Improve these tests to compare numerically the results
 

diff --git a/test/test_datasetGen/test_rasterizer.py → test/test_dataset/test_rasterizer.py b/test/test_datasetGen/test_rasterizer.py → test/test_dataset/test_rasterizer.py
@@ -3,8 +3,8 @@
 import sys
 
 sys.path.insert(0, path.join(path.dirname(__file__),"../../src"))
-from datasetGen import rasterizer
-import utils.filesystem as fs
+from deepleeo.dataset import rasterizer
+import deepleeo.utils.filesystem as fs
 
 # TODO: Improve these tests to compare numerically the results
 

diff --git a/test/test_datasetGen/test_sampleGenerator.py → test/test_dataset/test_sampleGenerator.py b/test/test_datasetGen/test_sampleGenerator.py → test/test_dataset/test_sampleGenerator.py
@@ -7,9 +7,9 @@
 from matplotlib.colors import ListedColormap
 
 sys.path.insert(0, path.join(path.dirname(__file__),"../../src"))
-from datasetGen import rasterizer as rstzr
-import datasetGen.sampleGenerator as sg
-import utils.filesystem as fs
+import deepleeo.dataset.rasterizer as rstzr
+import deepleeo.dataset.sampleGenerator as sg
+import deepleeo.utils.filesystem as fs
 
 # TODO: Create a method rasterizer.execute, that execute the whole proccess.
 class TestSampleGenerator():