Merge remote-tracking branch 'origin/master'

jrzkaminski · Nov 1, 2023 · 82dd79e · 82dd79e
2 parents 3f34340 + f234a9f
commit 82dd79e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/bamt/networks/base.py b/bamt/networks/base.py
@@ -684,7 +684,12 @@ def wrapper():
                         output[node.name] = node.choose(node_data, pvals=pvals)
             return output
 
-        if progress_bar:
+        if predict:
+            seq = []
+            for _ in tqdm(range(n), position=0, leave=True):
+                result = wrapper()
+                seq.append(result)
+        elif progress_bar:
             seq = Parallel(n_jobs=parall_count)(
                 delayed(wrapper)() for _ in tqdm(range(n), position=0, leave=True)
             )

diff --git a/docs/source/examples/add_ml_models_to_nodes.rst b/docs/source/examples/add_ml_models_to_nodes.rst
@@ -8,7 +8,7 @@ First, lets import BAMT modules and required machine learning modules.
 .. code-block:: python
 
     import bamt.networks as networks
-    import bamt.Preprocessors as pp
+    import bamt.preprocessors as pp
 
     import pandas as pd
     import numpy as np

diff --git a/docs/source/examples/learn_params_vis.rst b/docs/source/examples/learn_params_vis.rst
@@ -6,7 +6,7 @@ Used imports:
 .. code-block:: python
 
     import bamt.networks as networks
-    import bamt.Preprocessors as pp
+    import bamt.preprocessors as pp
 
     import pandas as pd
     import numpy as np

diff --git a/docs/source/examples/learn_sampling_predict.rst b/docs/source/examples/learn_sampling_predict.rst
@@ -6,7 +6,7 @@ Used imports:
 .. code-block:: python
 
     import bamt.networks as networks
-    import bamt.Preprocessors as pp
+    import bamt.preprocessors as pp
 
     import pandas as pd
     import numpy as np