chore: push has resource to entropy context

entropy-lab · Apr 27, 2021 · b0a6e77 · b0a6e77
1 parent b0294e6
commit b0a6e77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/quaentropy/api/execution.py b/quaentropy/api/execution.py
@@ -16,12 +16,12 @@ def __init__(
         self,
         exp_id: int,
         db: DataWriter,
-        used_topology: ExperimentResources,
+        experiment_resources: ExperimentResources,
     ) -> None:
         super().__init__()
         self._data_writer = db
         self._exp_id = exp_id
-        self._used_topology = used_topology
+        self._experiment_resources = experiment_resources
 
     def add_result(self, result: RawResultData):
         self._data_writer.save_result(self._exp_id, result)
@@ -33,7 +33,10 @@ def add_plot(self, plot: PlotSpec, data: Any):
         self._data_writer.save_plot(self._exp_id, plot, data)
 
     def get_resource(self, name):
-        return self._used_topology.get_resource(name)
+        return self._experiment_resources.get_resource(name)
+
+    def has_resource(self, name) -> bool:
+        return self._experiment_resources.has_resource(name)
 
     def current_experiment_results(self) -> SingleExperimentDataReader:
         if isinstance(self._data_writer, DataReader):

diff --git a/quaentropy/api/experiment.py b/quaentropy/api/experiment.py
@@ -53,7 +53,7 @@ def run(self) -> bool:
                 EntropyContext(
                     exp_id=self._id,
                     db=self._data_writer,
-                    used_topology=self._experiment_resources,
+                    experiment_resources=self._experiment_resources,
                 )
             )
             if result:

diff --git a/quaentropy/instruments/lab_topology.py b/quaentropy/instruments/lab_topology.py
@@ -398,7 +398,7 @@ def get_resource(self, name):
         if name in self._local_resources:
             return self._local_resources[name]
 
-    def has_resource(self, name):
+    def has_resource(self, name) -> bool:
         return name in self._resources or name in self._local_resources
 
     def _lock_all_resources(self):