yet more visualiser faffery

sdcondon · Aug 1, 2024 · 561d45e · 561d45e
1 parent b5b8487
commit 561d45e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/src/SCFirstOrderLogic.Documentation/Razor/Pages/lab/DiscriminationTreeVisualiser.razor b/src/SCFirstOrderLogic.Documentation/Razor/Pages/lab/DiscriminationTreeVisualiser.razor
@@ -134,17 +134,11 @@
         StateHasChanged();
     }
 
-    private class FormData : IValidatableObject
+    private class FormData(string variables, string term) : IValidatableObject
     {
-        public FormData(string variables, string term)
-        {
-            this.Variables = variables;
-            this.Term = term;
-        }
-
-        public string Variables { get; set; }
+        public string Variables { get; set; } = variables;
 
-        public string Term { get; set; }
+        public string Term { get; set; } = term;
 
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {

diff --git a/src/SCFirstOrderLogic.Documentation/Razor/Pages/lab/PathTreeVisualiser.razor b/src/SCFirstOrderLogic.Documentation/Razor/Pages/lab/PathTreeVisualiser.razor
@@ -132,7 +132,7 @@
             var sentence = SentenceParser.BasicParser.Parse($"forall {formData.Variables}, P({formData.Term})");
             var visitor = new TermExtractor();
             visitor.Visit(sentence);
-            pathTree.Add(visitor.Term);
+            pathTree.Add(visitor.Term!);
             StateHasChanged();
         }
     }
@@ -144,17 +144,11 @@
         StateHasChanged();
     }
 
-    private class FormData : IValidatableObject
+    private class FormData(string variables, string term) : IValidatableObject
     {
-        public FormData(string variables, string term)
-        {
-            this.Variables = variables;
-            this.Term = term;
-        }
-
-        public string Variables { get; set; }
+        public string Variables { get; set; } = variables;
 
-        public string Term { get; set; }
+        public string Term { get; set; } = term;
 
         public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
         {