Optimize triple/quadruple ctors

mdesalvo · Nov 26, 2023 · 62f4273 · 62f4273
1 parent 096a0e2
commit 62f4273
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 22 deletions.
diff --git a/RDFSharp/Model/RDFTriple.cs b/RDFSharp/Model/RDFTriple.cs
@@ -68,7 +68,8 @@ public class RDFTriple : IEquatable<RDFTriple>
         /// <summary>
         /// SPO-flavor ctor
         /// </summary>
-        public RDFTriple(RDFResource subj, RDFResource pred, RDFResource obj)
+        public RDFTriple(RDFResource subj, RDFResource pred, RDFResource obj) 
+            : this(subj, pred)
         {
             #region Guards
             if (pred == null)
@@ -78,29 +79,33 @@ public RDFTriple(RDFResource subj, RDFResource pred, RDFResource obj)
             #endregion
 
             TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPO;
-            Subject = subj ?? new RDFResource();
-            Predicate = pred;
             Object = obj ?? new RDFResource();
-            LazyTripleID = new Lazy<long>(() => RDFModelUtilities.CreateHash(ToString()));
-            LazyReificationSubject = new Lazy<RDFResource>(() => new RDFResource(string.Concat("bnode:", TripleID.ToString())));
         }
 
         /// <summary>
         /// SPL-flavor ctor
         /// </summary>
         public RDFTriple(RDFResource subj, RDFResource pred, RDFLiteral lit)
+            : this(subj, pred)
+        {
+            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPL;
+            Object = lit ?? new RDFPlainLiteral(string.Empty);
+        }
+
+        /// <summary>
+        /// Initializer-ctor for common triple properties
+        /// </summary>
+        private RDFTriple(RDFResource subj, RDFResource pred)
         {
             #region Guards
             if (pred == null)
-                throw new RDFModelException("Cannot create RDFTriple because \"pred\" parameter is null");
+                throw new RDFModelException("Cannot create RDFTriple because given \"pred\" parameter is null");
             if (pred.IsBlank)
-                throw new RDFModelException("Cannot create RDFTriple because \"pred\" parameter is a blank resource");
+                throw new RDFModelException("Cannot create RDFTriple because given \"pred\" parameter is a blank resource");
             #endregion
 
-            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPL;
             Subject = subj ?? new RDFResource();
             Predicate = pred;
-            Object = lit ?? new RDFPlainLiteral(string.Empty);            
             LazyTripleID = new Lazy<long>(() => RDFModelUtilities.CreateHash(ToString()));
             LazyReificationSubject = new Lazy<RDFResource>(() => new RDFResource(string.Concat("bnode:", TripleID.ToString())));
         }

diff --git a/RDFSharp/Store/RDFQuadruple.cs b/RDFSharp/Store/RDFQuadruple.cs
@@ -69,36 +69,37 @@ public class RDFQuadruple : IEquatable<RDFQuadruple>
         /// SPO-flavor ctor
         /// </summary>
         public RDFQuadruple(RDFContext context, RDFResource subj, RDFResource pred, RDFResource obj)
+            : this(context, subj, pred)
         {
-            if (pred == null)
-                throw new RDFStoreException("Cannot create RDFQuadruple because given \"pred\" parameter is null");
-            if (pred.IsBlank)
-                throw new RDFStoreException("Cannot create RDFQuadruple because given \"pred\" parameter is a blank resource");
-
-            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPO;
-            Context = context ?? new RDFContext();
-            Subject = subj ?? new RDFResource();
-            Predicate = pred;
+            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPO;   
             Object = obj ?? new RDFResource();
-            LazyQuadrupleID = new Lazy<long>(() => RDFModelUtilities.CreateHash(ToString()));
-            LazyReificationSubject = new Lazy<RDFResource>(() => new RDFResource(string.Concat("bnode:", QuadrupleID.ToString())));
         }
 
         /// <summary>
         /// SPL-flavor ctor
         /// </summary>
         public RDFQuadruple(RDFContext context, RDFResource subj, RDFResource pred, RDFLiteral lit)
+            : this(context, subj, pred)
         {
+            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPL;
+            Object = lit ?? new RDFPlainLiteral(string.Empty);
+        }
+
+        /// <summary>
+        /// Initializer-ctor for common quadruple properties
+        /// </summary>
+        private RDFQuadruple(RDFContext context, RDFResource subj, RDFResource pred)
+        {
+            #region Guards
             if (pred == null)
                 throw new RDFStoreException("Cannot create RDFQuadruple because given \"pred\" parameter is null");
             if (pred.IsBlank)
                 throw new RDFStoreException("Cannot create RDFQuadruple because given \"pred\" parameter is a blank resource");
+            #endregion
 
-            TripleFlavor = RDFModelEnums.RDFTripleFlavors.SPL;
             Context = context ?? new RDFContext();
             Subject = subj ?? new RDFResource();
             Predicate = pred;
-            Object = lit ?? new RDFPlainLiteral(string.Empty);
             LazyQuadrupleID = new Lazy<long>(() => RDFModelUtilities.CreateHash(ToString()));
             LazyReificationSubject = new Lazy<RDFResource>(() => new RDFResource(string.Concat("bnode:", QuadrupleID.ToString())));
         }