Parcourir la source

Merge branch 'release/v0.2.4'

Jérôme BUISINE il y a 4 ans
Parent
commit
8345a697a8
3 fichiers modifiés avec 9 ajouts et 4 suppressions
  1. 1 1
      custom_config.py
  2. 7 2
      generate/generate_reconstructed_data.py
  3. 1 1
      modules

+ 1 - 1
custom_config.py

@@ -16,7 +16,7 @@ context_vars = vars()
 
 # variables
 
-features_choices_labels         = ['static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction', 'diff_filter']
+features_choices_labels         = ['static', 'svd_reconstruction', 'fast_ica_reconstruction', 'ipca_reconstruction', 'min_diff_filter']
 
 # parameters
 

+ 7 - 2
generate/generate_reconstructed_data.py

@@ -167,11 +167,16 @@ def main():
                                     help="list of specific param for each feature choice (See README.md for further information in 3D mode)", 
                                     default='100, 200 :: 50, 25',
                                     required=True)
+    parser.add_argument('--size', type=str, 
+                                help="specific size of image", 
+                                default='100, 100',
+                                required=True)
 
     args = parser.parse_args()
 
     p_features  = list(map(str.strip, args.features.split(',')))
-    p_params   = list(map(str.strip, args.params.split('::')))
+    p_params    = list(map(str.strip, args.params.split('::')))
+    p_size      = args.size
 
     transformations = []
 
@@ -180,7 +185,7 @@ def main():
         if feature not in features_choices or feature == 'static':
             raise ValueError("Unknown feature, please select a correct feature (`static` excluded) : ", features_choices)
 
-        transformations.append(Transformation(feature, p_params[id]))
+        transformations.append(Transformation(feature, p_params[id], p_size))
 
     # generate all or specific feature data
     for transformation in transformations:

+ 1 - 1
modules

@@ -1 +1 @@
-Subproject commit f7a8c2dace4ef260182a66579d0a0be09ec59dc1
+Subproject commit 283a56becc8ca9103ac3d9f1cdaa6f9daa2dcb5c