edsl 0.1.37.dev6__py3-none-any.whl → 0.1.38.dev1__py3-none-any.whl

edsl/study/__init__.py

@@ -1,4 +1,4 @@
-from edsl.study.ObjectEntry import ObjectEntry
-from edsl.study.ProofOfWork import ProofOfWork
-from edsl.study.SnapShot import SnapShot
-from edsl.study.Study import Study
+from edsl.study.ObjectEntry import ObjectEntry
+from edsl.study.ProofOfWork import ProofOfWork
+from edsl.study.SnapShot import SnapShot
+from edsl.study.Study import Study

edsl/surveys/DAG.py

@@ -1,148 +1,148 @@
-"""Directed Acyclic Graph (DAG) class."""
-
-from collections import UserDict
-from graphlib import TopologicalSorter
-
-
-class DAG(UserDict):
-    """Class for creating a Directed Acyclic Graph (DAG) from a dictionary."""
-
-    def __init__(self, data: dict):
-        """Initialize the DAG class."""
-        super().__init__(data)
-        self.reverse_mapping = self._create_reverse_mapping()
-        self.validate_no_cycles()
-
-    def _create_reverse_mapping(self):
-        """
-        Create a reverse mapping of the DAG, where the keys are the children and the values are the parents.
-
-        Example usage:
-
-        .. code-block:: python
-
-            data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
-            dag = DAG(data)
-            dag._create_reverse_mapping()
-            {'b': {'a'}, 'c': {'a'}, 'd': {'b'}}
-
-        """
-        rev_map = {}
-        for key, values in self.items():
-            for value in values:
-                rev_map.setdefault(value, set()).add(key)
-        return rev_map
-
-    def get_all_children(self, key):
-        """Get all children of a node in the DAG."""
-        children = set()
-
-        def dfs(node):
-            for child in self.reverse_mapping.get(node, []):
-                if child not in children:
-                    children.add(child)
-                    dfs(child)
-
-        dfs(key)
-        return children
-
-    def topologically_sorted_nodes(self):
-        """
-        Return a sequence of the DAG.
-
-        Example usage:
-
-        .. code-block:: python
-
-            data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
-            dag = DAG(data)
-            dag.topologically_sorted_nodes() == ['c', 'd', 'b', 'a']
-            True
-
-        """
-        return list(TopologicalSorter(self).static_order())
-
-    def __add__(self, other_dag):
-        """Combine two DAGs."""
-        d = {}
-        combined_keys = set(self.keys()).union(set(other_dag.keys()))
-        for key in combined_keys:
-            d[key] = self.get(key, set({})).union(other_dag.get(key, set({})))
-        return DAG(d)
-        # if textify:
-        #     return DAG(self.textify(d))
-        # else:
-        #     return DAG(d)
-
-    def remove_node(self, node: int) -> None:
-        """Remove a node and all its connections from the DAG."""
-        self.pop(node, None)
-        for connections in self.values():
-            connections.discard(node)
-        # Adjust remaining nodes if necessary
-        self._adjust_nodes_after_removal(node)
-
-    def _adjust_nodes_after_removal(self, removed_node: int) -> None:
-        """Adjust node indices after a node is removed."""
-        new_dag = {}
-        for node, connections in self.items():
-            new_node = node if node < removed_node else node - 1
-            new_connections = {c if c < removed_node else c - 1 for c in connections}
-            new_dag[new_node] = new_connections
-        self.clear()
-        self.update(new_dag)
-
-    @classmethod
-    def example(cls):
-        """Return an example of the `DAG`."""
-        data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
-        return cls(data)
-
-    def detect_cycles(self):
-        """
-        Detect cycles in the DAG using depth-first search.
-
-        :return: A list of cycles if any are found, otherwise an empty list.
-        """
-        visited = set()
-        path = []
-        cycles = []
-
-        def dfs(node):
-            if node in path:
-                cycle = path[path.index(node) :]
-                cycles.append(cycle + [node])
-                return
-
-            if node in visited:
-                return
-
-            visited.add(node)
-            path.append(node)
-
-            for child in self.get(node, []):
-                dfs(child)
-
-            path.pop()
-
-        for node in self:
-            if node not in visited:
-                dfs(node)
-
-        return cycles
-
-    def validate_no_cycles(self):
-        """
-        Validate that the DAG does not contain any cycles.
-
-        :raises ValueError: If cycles are detected in the DAG.
-        """
-        cycles = self.detect_cycles()
-        if cycles:
-            raise ValueError(f"Cycles detected in the DAG: {cycles}")
-
-
-if __name__ == "__main__":
-    import doctest
-
-    doctest.testmod()
+"""Directed Acyclic Graph (DAG) class."""
+
+from collections import UserDict
+from graphlib import TopologicalSorter
+
+
+class DAG(UserDict):
+    """Class for creating a Directed Acyclic Graph (DAG) from a dictionary."""
+
+    def __init__(self, data: dict):
+        """Initialize the DAG class."""
+        super().__init__(data)
+        self.reverse_mapping = self._create_reverse_mapping()
+        self.validate_no_cycles()
+
+    def _create_reverse_mapping(self):
+        """
+        Create a reverse mapping of the DAG, where the keys are the children and the values are the parents.
+
+        Example usage:
+
+        .. code-block:: python
+
+            data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
+            dag = DAG(data)
+            dag._create_reverse_mapping()
+            {'b': {'a'}, 'c': {'a'}, 'd': {'b'}}
+
+        """
+        rev_map = {}
+        for key, values in self.items():
+            for value in values:
+                rev_map.setdefault(value, set()).add(key)
+        return rev_map
+
+    def get_all_children(self, key):
+        """Get all children of a node in the DAG."""
+        children = set()
+
+        def dfs(node):
+            for child in self.reverse_mapping.get(node, []):
+                if child not in children:
+                    children.add(child)
+                    dfs(child)
+
+        dfs(key)
+        return children
+
+    def topologically_sorted_nodes(self):
+        """
+        Return a sequence of the DAG.
+
+        Example usage:
+
+        .. code-block:: python
+
+            data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
+            dag = DAG(data)
+            dag.topologically_sorted_nodes() == ['c', 'd', 'b', 'a']
+            True
+
+        """
+        return list(TopologicalSorter(self).static_order())
+
+    def __add__(self, other_dag):
+        """Combine two DAGs."""
+        d = {}
+        combined_keys = set(self.keys()).union(set(other_dag.keys()))
+        for key in combined_keys:
+            d[key] = self.get(key, set({})).union(other_dag.get(key, set({})))
+        return DAG(d)
+        # if textify:
+        #     return DAG(self.textify(d))
+        # else:
+        #     return DAG(d)
+
+    def remove_node(self, node: int) -> None:
+        """Remove a node and all its connections from the DAG."""
+        self.pop(node, None)
+        for connections in self.values():
+            connections.discard(node)
+        # Adjust remaining nodes if necessary
+        self._adjust_nodes_after_removal(node)
+
+    def _adjust_nodes_after_removal(self, removed_node: int) -> None:
+        """Adjust node indices after a node is removed."""
+        new_dag = {}
+        for node, connections in self.items():
+            new_node = node if node < removed_node else node - 1
+            new_connections = {c if c < removed_node else c - 1 for c in connections}
+            new_dag[new_node] = new_connections
+        self.clear()
+        self.update(new_dag)
+
+    @classmethod
+    def example(cls):
+        """Return an example of the `DAG`."""
+        data = {"a": ["b", "c"], "b": ["d"], "c": [], "d": []}
+        return cls(data)
+
+    def detect_cycles(self):
+        """
+        Detect cycles in the DAG using depth-first search.
+
+        :return: A list of cycles if any are found, otherwise an empty list.
+        """
+        visited = set()
+        path = []
+        cycles = []
+
+        def dfs(node):
+            if node in path:
+                cycle = path[path.index(node) :]
+                cycles.append(cycle + [node])
+                return
+
+            if node in visited:
+                return
+
+            visited.add(node)
+            path.append(node)
+
+            for child in self.get(node, []):
+                dfs(child)
+
+            path.pop()
+
+        for node in self:
+            if node not in visited:
+                dfs(node)
+
+        return cycles
+
+    def validate_no_cycles(self):
+        """
+        Validate that the DAG does not contain any cycles.
+
+        :raises ValueError: If cycles are detected in the DAG.
+        """
+        cycles = self.detect_cycles()
+        if cycles:
+            raise ValueError(f"Cycles detected in the DAG: {cycles}")
+
+
+if __name__ == "__main__":
+    import doctest
+
+    doctest.testmod()

edsl/surveys/Memory.py

@@ -1,31 +1,31 @@
-"""This module contains the Memory class, which is a list of prior questions."""
-
-from collections import UserList
-
-
-class Memory(UserList):
-    """Class for holding the questions (stored as names) that we want the the agent to have available when answering a question."""
-
-    def __init__(self, prior_questions: list[str] = None):
-        """Initialize the Memory object."""
-        super().__init__(prior_questions or [])
-
-    def add_prior_question(self, prior_question):
-        """Add a prior question to the memory."""
-        if prior_question not in self:
-            self.append(prior_question)
-        else:
-            raise ValueError(f"{prior_question} is already in the memory.")
-
-    def __repr__(self):
-        """Return a string representation of the Memory object."""
-        return f"Memory(prior_questions={self.data})"
-
-    def to_dict(self):
-        """Create a dictionary representation of the Memory object."""
-        return {"prior_questions": self.data}
-
-    @classmethod
-    def from_dict(cls, data):
-        """Create a Memory object from a dictionary."""
-        return cls(**data)
+"""This module contains the Memory class, which is a list of prior questions."""
+
+from collections import UserList
+
+
+class Memory(UserList):
+    """Class for holding the questions (stored as names) that we want the the agent to have available when answering a question."""
+
+    def __init__(self, prior_questions: list[str] = None):
+        """Initialize the Memory object."""
+        super().__init__(prior_questions or [])
+
+    def add_prior_question(self, prior_question):
+        """Add a prior question to the memory."""
+        if prior_question not in self:
+            self.append(prior_question)
+        else:
+            raise ValueError(f"{prior_question} is already in the memory.")
+
+    def __repr__(self):
+        """Return a string representation of the Memory object."""
+        return f"Memory(prior_questions={self.data})"
+
+    def to_dict(self):
+        """Create a dictionary representation of the Memory object."""
+        return {"prior_questions": self.data}
+
+    @classmethod
+    def from_dict(cls, data):
+        """Create a Memory object from a dictionary."""
+        return cls(**data)