Sync latest changes (#313)

mdesalvo · Sep 12, 2023 · 65a2755 · 65a2755
1 parent 57778b6
commit 65a2755
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 2 deletions.
diff --git a/RDFSharp/Model/RDFModelUtilities.cs b/RDFSharp/Model/RDFModelUtilities.cs
@@ -279,7 +279,7 @@ internal static List<RDFTriple> SelectTriples(RDFGraph graph, RDFResource subj,
                 List<RDFIndexedTriple> P = new List<RDFIndexedTriple>();
                 List<RDFIndexedTriple> O = new List<RDFIndexedTriple>();
                 List<RDFIndexedTriple> L = new List<RDFIndexedTriple>();
-                List<RDFIndexedTriple>matchResultIndexedTriples = new List<RDFIndexedTriple>();
+                List<RDFIndexedTriple> matchResultIndexedTriples = new List<RDFIndexedTriple>();
                 StringBuilder queryFilters = new StringBuilder();
 
                 //Filter by Subject

diff --git a/RDFSharp/Model/Vocabularies/OWL.cs b/RDFSharp/Model/Vocabularies/OWL.cs
@@ -413,6 +413,11 @@ public static class OWL
             /// </summary>
             public static readonly RDFResource ANNOTATED_TARGET = new RDFResource(string.Concat(OWL.BASE_URI, "annotatedTarget"));
 
+            /// <summary>
+            /// owl:deprecated
+            /// </summary>
+            public static readonly RDFResource DEPRECATED = new RDFResource(string.Concat(OWL.BASE_URI,"deprecated"));
+
             /// <summary>
             /// owl:real [OWL2]
             /// </summary>

diff --git a/RDFSharp/Query/Mirella/Algebra/RDFPattern.cs b/RDFSharp/Query/Mirella/Algebra/RDFPattern.cs
@@ -143,6 +143,7 @@ internal string ToString(List<RDFNamespace> prefixes)
         public RDFPattern Optional()
         {
             IsOptional = true;
+            JoinAsUnion = false;
             return this;
         }
 
@@ -151,6 +152,7 @@ public RDFPattern Optional()
         /// </summary>
         public RDFPattern UnionWithNext()
         {
+            IsOptional = false;
             JoinAsUnion = true;
             return this;
         }

diff --git a/RDFSharp/Query/Mirella/Algebra/RDFPatternGroup.cs b/RDFSharp/Query/Mirella/Algebra/RDFPatternGroup.cs
@@ -199,6 +199,7 @@ public RDFPatternGroup AddFilter(RDFFilter filter)
         public RDFPatternGroup Optional()
         {
             IsOptional = true;
+            JoinAsUnion = false;
             return this;
         }
 
@@ -207,6 +208,7 @@ public RDFPatternGroup Optional()
         /// </summary>
         public RDFPatternGroup UnionWithNext()
         {
+            IsOptional = false;
             JoinAsUnion = true;
             return this;
         }

diff --git a/RDFSharp/Store/Engines/RDFMemoryStore.cs b/RDFSharp/Store/Engines/RDFMemoryStore.cs
@@ -35,7 +35,7 @@ public class RDFMemoryStore : RDFStore, IEnumerable<RDFQuadruple>, IDisposable
         /// <summary>
         /// Count of the store's quadruples
         /// </summary>
-        public long QuadruplesCount => IndexedQuadruples.Count;
+        public override long QuadruplesCount => IndexedQuadruples.Count;
 
         /// <summary>
         /// Gets the enumerator on the store's quadruples for iteration

diff --git a/RDFSharp/Store/RDFStore.cs b/RDFSharp/Store/RDFStore.cs
@@ -40,6 +40,11 @@ public abstract class RDFStore : RDFDataSource, IEquatable<RDFStore>
         /// Type of the store
         /// </summary>
         public string StoreType { get; set; }
+
+        /// <summary>
+        /// Count of the store's quadruples
+        /// </summary>
+        public abstract long QuadruplesCount { get; }
         #endregion
 
         #region Interfaces