Merge pull request #371 from leondavi/show_model_with_bounding

[show_model_with_bounding] fix issue
leondavi · Jul 15, 2024 · d663453 · d663453
2 parents 79820e1 + 3a24fce
commit d663453
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json b/inputJsonsFiles/DistributedConfig/dc_AEC_1d_2c_1s_4r_4w.json
@@ -88,7 +88,7 @@
             "layersSizes": "8,4,2,4,8,8",
             "_doc_layersSizes": "List of postive integers [L0, L1, ..., LN]",
             "layerTypesList": "1,3,3,3,3,10",
-            "_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 |",
+            "_doc_LayerTypes": " Default:0 | Scaling:1 | CNN:2 | Perceptron:3 | Pooling:4 | Probabilistic:5 | LSTM:6 | Reccurrent:7 | Unscaling:8 | Flatten:9 | Bounding:10 |",
             "layers_functions": "1,6,6,6,6,1",
             "_doc_layers_functions_activation": " Threshold:1 | Sign:2 | Logistic:3 | Tanh:4 | Linear:5 | ReLU:6 | eLU:7 | SeLU:8 | Soft-plus:9 | Soft-sign:10 | Hard-sigmoid:11 |",
             "_doc_layer_functions_pooling": " none:1 | Max:2 | Avg:3 |",

diff --git a/src_py/nerlPlanner/JsonElementWorkerDefinitions.py b/src_py/nerlPlanner/JsonElementWorkerDefinitions.py
@@ -75,13 +75,15 @@
 # Maps from layer type to the functionality of layer mapping 
 LayerTypeToFunctionalMap = OrderedDict([
     ("Scaling" , ScalingMethodMap),
-    ("CNN" , None),
+    ("Conv" , None),
     ("Perceptron" , ActivationFunctionsMap),
     ("Pooling" , PoolingMethodMap),
     ("Probabilistic" , ProbabilisticActivationFunctionMap),
     ("LSTM" , None),
     ("Reccurrent" , None),
-    ("Unscaling" , UnScalingMethodMap)]
+    ("Unscaling" , UnScalingMethodMap),
+    ("Flatten" , FlattenMethodMap),
+    ("Bounding" , BoundingMethodMap)]
 )
 
 # Model type name should be suitable with erlang atoms convention!