Merge branch 'master' into examples-rework

aimclub · Sep 23, 2023 · 4059e66 · 4059e66
2 parents d8384ff + 390e2da
commit 4059e66
Show file tree

Hide file tree

Showing 19 changed files with 393 additions and 306 deletions.
diff --git a/bamt/builders/evo_builder.py b/bamt/builders/evo_builder.py
@@ -1,7 +1,6 @@
 from datetime import timedelta
 from typing import Dict, Optional, List, Tuple
 
-
 from golem.core.adapter import DirectAdapter
 from golem.core.dag.verification_rules import has_no_cycle, has_no_self_cycled_nodes
 from golem.core.log import Log

diff --git a/bamt/config.py b/bamt/config.py
@@ -9,9 +9,6 @@
     config.read(CONFIGFILE)
 else:
     open(CONFIGFILE, "a").close()
-    config["NODES"] = {
-        "models_storage": path.join(path.expanduser("~"), "BAMT", "Nodes_data")
-    }
     config["LOG"] = {
         "log_conf_loc": path.join(path.dirname(path.abspath(__file__)), "logging.conf")
     }

diff --git a/bamt/networks/__init__.py b/bamt/networks/__init__.py
@@ -1,7 +1,6 @@
-__all__ = [
-    "base",
-    "hybrid_bn",
-    "continuous_bn",
-    "discrete_bn",
-    "big_brave_bn",
-]
+from bamt.networks.base import BaseNetwork
+from bamt.networks.big_brave_bn import BigBraveBN
+from bamt.networks.composite_bn import CompositeBN
+from bamt.networks.continuous_bn import ContinuousBN
+from bamt.networks.discrete_bn import DiscreteBN
+from bamt.networks.hybrid_bn import HybridBN