Merge pull request #132 from pyscal/restructure_query_operators

Restructure query operators
pyscal · Jun 27, 2024 · ea53920 · ea53920
2 parents ba90072 + 6c462b0
commit ea53920
Show file tree

Hide file tree

Showing 16 changed files with 1,579 additions and 104 deletions.
diff --git a/atomrdf/network/network.py b/atomrdf/network/network.py
@@ -383,7 +383,7 @@ def create_query(self, source, destinations, enforce_types=True):
         #iterate through the list, if they have condition parents, add them explicitely
         for destination in destinations:
             for parent in destination._condition_parents:
-                if parent.name not in [d.name for d in destinations]:
+                if parent.variable_name not in [d.variable_name for d in destinations]:
                     destinations.append(parent)
 
         #all names are now collected, in a list of lists

diff --git a/atomrdf/network/ontology.py b/atomrdf/network/ontology.py
@@ -134,5 +134,6 @@ def read_ontology():
     combo.add_path(("asmo:InteratomicPotential", "cmso:hasReference", "string"))
     combo.add_path(("asmo:InteratomicPotential", "rdfs:label", "string"))
 
+
     # return
     return combo
diff --git a/atomrdf/network/term.py b/atomrdf/network/term.py
@@ -274,14 +274,15 @@ def _is_data_node(self):
 
 
     def _create_condition_string(self, condition, val):
-        return f'(?{self.query_name}{condition}"{val}"^^xsd:{self._clean_datatype(self.range[0])})'
+        return f'(?{self.variable_name}{condition}"{val}"^^xsd:{self._clean_datatype(self.range[0])})'
 
     # overloading operators
     def __eq__(self, val):
         """
         =
         """
-        # self._is_number(val)
+        #print("eq")
+        #print(f'lhs {self} rhs {val}')
         self._is_data_node()
         item = copy.deepcopy(self)
         item._condition = item._create_condition_string("=", val)
@@ -316,6 +317,8 @@ def __ge__(self, val):
         return item
 
     def __gt__(self, val):
+        #print("gt")
+        #print(f'lhs {self} rhs {val}')
         self._is_number(val)
         self._is_data_node()
         item = copy.deepcopy(self)
@@ -358,9 +361,11 @@ def __or__(self, term):
     def or_(self, term):
         self.__or__(term)
 
-    def __rshift__(self, term):
-        item = copy.deepcopy(term)
-        item._parents.append(copy.deepcopy(self))
+    def __matmul__(self, term):
+        #print("matmul")
+        #print(f'lhs {self} rhs {term}')
+        item = copy.deepcopy(self)
+        item._parents.append(copy.deepcopy(term))
         return item
 
     def refresh_condition(self):

diff --git a/examples/01_getting_started.ipynb b/examples/01_getting_started.ipynb
@@ -3589,7 +3589,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,

diff --git a/examples/02_grain_boundaries.ipynb b/examples/02_grain_boundaries.ipynb
@@ -1617,7 +1617,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,

diff --git a/examples/03_point_defects.ipynb b/examples/03_point_defects.ipynb
@@ -5214,7 +5214,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,

diff --git a/examples/05_interstitials.ipynb b/examples/05_interstitials.ipynb
@@ -2517,7 +2517,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,

diff --git a/examples/07_dislocation.ipynb b/examples/07_dislocation.ipynb
@@ -2733,7 +2733,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,

diff --git a/examples/09_structure_modification.ipynb b/examples/09_structure_modification.ipynb
@@ -8482,7 +8482,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.8"
+   "version": "3.1.-1"
   }
  },
  "nbformat": 4,