SLight code cleanups

Author: mdesalvo

OWLSharp/Reasoner/OWLReasoner.cs

@@ -73,7 +73,7 @@ public async Task<List<OWLInference>> ApplyToOntologyAsync(OWLOntology ontology,
                 Rules = Rules.Distinct().ToList();
 
                 #region Execute
-                OWLEvents.RaiseInfo($"Launching OWL2/SWRL reasoner on ontology '{ontology.IRI}'...");
+                OWLEvents.RaiseInfo($"Launching reasoner on ontology '{ontology.IRI}'...");
 
                 #region Init registry & context
                 //Initialize inference registry
@@ -259,15 +259,15 @@ await Task.WhenAll(clsAsnAxiomsTask, dtPropAsnAxiomsTask, opPropAsnAxiomsTask, s
                 inferences.AddRange(inferenceRegistry.SelectMany(ir => ir.Value ?? emptyInferenceSet).Distinct());
                 #endregion
 
-                OWLEvents.RaiseInfo($"Completed OWL2/SWRL reasoner on ontology '{ontology.IRI}' => {inferences.Count} inferences");
+                OWLEvents.RaiseInfo($"Completed reasoner on ontology '{ontology.IRI}' => {inferences.Count} inferences");
                 #endregion
 
                 #region Iterate
                 if (reasonerOptions.EnableIterativeReasoning
                      && inferences.Count > 0
                      && reasonerOptions.CurrentIteration < reasonerOptions.MaxAllowedIterations)
                 {
-                    OWLEvents.RaiseInfo($"Merging inferences into ontology '{ontology.IRI}' (iteration: {reasonerOptions.CurrentIteration})...");
+                    OWLEvents.RaiseInfo($"Merging inferences (iteration: {reasonerOptions.CurrentIteration})...");
                     foreach (IGrouping<Type,OWLInference> inferenceGroupType in inferences.GroupBy(inf => inf.Axiom.GetType()))
                     {
                         switch (inferenceGroupType.Key.BaseType?.Name)
@@ -294,7 +294,6 @@ await Task.WhenAll(clsAsnAxiomsTask, dtPropAsnAxiomsTask, opPropAsnAxiomsTask, s
                                 break;
                         }
                     }
-                    OWLEvents.RaiseInfo($"Completed merging of inferences into ontology '{ontology.IRI}' (iteration: {reasonerOptions.CurrentIteration})");
 
                     reasonerOptions.CurrentIteration++;
                     inferences.AddRange(await ApplyToOntologyAsync(ontology, reasonerOptions));

OWLSharp/Validator/OWLValidator.cs

@@ -59,15 +59,15 @@ public OWLValidator AddRule(OWLEnums.OWLValidatorRules rule)
         public Task<List<OWLIssue>> ApplyToOntologyAsync(OWLOntology ontology)
         {
             List<OWLIssue> issues = new List<OWLIssue>();
-            Rules = Rules.Distinct().ToList();
 
             if (ontology != null)
             {
-                OWLEvents.RaiseInfo($"Launching OWL2 validator on ontology '{ontology.IRI}'...");
+                OWLEvents.RaiseInfo($"Launching validator on ontology '{ontology.IRI}'...");
 
                 #region Init registry & context
                 //Initialize issue registry
                 Dictionary<string, List<OWLIssue>> issueRegistry = new Dictionary<string, List<OWLIssue>>(Rules.Count);
+                Rules = Rules.Distinct().ToList();
                 Rules.ForEach(rule => issueRegistry.Add(rule.ToString(), null));
                 #endregion
 
@@ -179,7 +179,7 @@ public Task<List<OWLIssue>> ApplyToOntologyAsync(OWLOntology ontology)
                 issues.AddRange(issueRegistry.SelectMany(ir => ir.Value ?? emptyIssueSet));
                 #endregion
 
-                OWLEvents.RaiseInfo($"Completed OWL2 validator on ontology {ontology.IRI} => {issues.Count} issues");
+                OWLEvents.RaiseInfo($"Completed validator on ontology {ontology.IRI} => {issues.Count} issues");
             }
 
             return Task.FromResult(issues);