General cleanup and very minor changes in advance of release.

homothetyhk · Jan 8, 2022 · d40898d · d40898d
1 parent 410fbed
commit d40898d
Show file tree

Hide file tree

Showing 64 changed files with 199 additions and 557 deletions.
diff --git a/RandomizerCore/CharmNotchCosts.cs b/RandomizerCore/CharmNotchCosts.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RandomizerCore
+namespace RandomizerCore
 {
     public static class CharmNotchCosts
     {

diff --git a/RandomizerCore/Collections/HashQueue.cs b/RandomizerCore/Collections/HashQueue.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Collections;
 using RandomizerCore.Extensions;
 
 namespace RandomizerCore.Logic

diff --git a/RandomizerCore/Collections/PriorityQueue.cs b/RandomizerCore/Collections/PriorityQueue.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 namespace RandomizerCore.Collections
 {

diff --git a/RandomizerCore/Collections/SortedArrayList.cs b/RandomizerCore/Collections/SortedArrayList.cs
@@ -1,13 +1,11 @@
 using RandomizerCore.Extensions;
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace RandomizerCore.Collections
 {
+    /// <summary>
+    /// A sorted list which maintains its sort through binary search during list operations.
+    /// </summary>
     public class SortedArrayList<T> : IReadOnlyList<T>, ICollection<T> where T : IComparable<T>
     {
         private readonly List<T> ts;

diff --git a/RandomizerCore/Exceptions/OutOfLocationsException.cs b/RandomizerCore/Exceptions/OutOfLocationsException.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace RandomizerCore.Exceptions
+namespace RandomizerCore.Exceptions
 {
     public class OutOfLocationsException : Exception
     {

diff --git a/RandomizerCore/Exceptions/ValidationException.cs b/RandomizerCore/Exceptions/ValidationException.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RandomizerCore.Exceptions
+namespace RandomizerCore.Exceptions
 {
     public class ValidationException : Exception
     {

diff --git a/RandomizerCore/Extensions/CollectionExtensions.cs b/RandomizerCore/Extensions/CollectionExtensions.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace RandomizerCore.Extensions
+namespace RandomizerCore.Extensions
 {
     public static class CollectionExtensions
     {

diff --git a/RandomizerCore/Extensions/RandomExtensions.cs b/RandomizerCore/Extensions/RandomExtensions.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace RandomizerCore.Extensions
+namespace RandomizerCore.Extensions
 {
     public static class RandomExtensions
     {

diff --git a/RandomizerCore/Extensions/StringExtensions.cs b/RandomizerCore/Extensions/StringExtensions.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Text;
 
 namespace RandomizerCore.Extensions
 {

diff --git a/RandomizerCore/GeneralizedPlacement.cs b/RandomizerCore/GeneralizedPlacement.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using RandomizerCore.Logic;
+using RandomizerCore.Logic;
 
 namespace RandomizerCore
 {

diff --git a/RandomizerCore/IPriorityModifier.cs b/RandomizerCore/IPriorityModifier.cs
diff --git a/RandomizerCore/Json/JsonUtil.cs b/RandomizerCore/Json/JsonUtil.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
+using System.Reflection;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Linq;
 using RandomizerCore.Logic;
-using static RandomizerCore.LogHelper;
 
 namespace RandomizerCore.Json
 {

diff --git a/RandomizerCore/Json/LMConverter.cs b/RandomizerCore/Json/LMConverter.cs
@@ -0,0 +1,64 @@
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using RandomizerCore.Logic;
+using RandomizerCore.StringLogic;
+
+namespace RandomizerCore.Json
+{
+    public class LMConverter : JsonConverter<LogicManager>
+    {
+        public override LogicManager ReadJson(JsonReader reader, Type objectType, LogicManager existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            LogicManagerBuilder lmb = new();
+            JObject lm = JObject.Load(reader);
+            lmb.LP = lm[nameof(LogicManager.LP)].ToObject<LogicProcessor>();
+            lmb.VariableResolver = lm[nameof(LogicManager.VariableResolver)].ToObject<VariableResolver>();
+
+            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Terms, lm["Terms"]);
+            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Waypoints, lm["Waypoints"]);
+            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Transitions, lm["Transitions"]);
+            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Locations, lm["Logic"]);
+            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Items, lm["Items"]);
+
+            return new(lmb);
+        }
+
+        public override void WriteJson(JsonWriter writer, LogicManager value, JsonSerializer serializer)
+        {
+            writer.WriteStartObject();
+
+            TermConverter tc = new() { LM = value };
+            LogicDefConverter ldc = new() { LM = value };
+            serializer.Converters.Add(tc);
+            serializer.Converters.Add(ldc);
+
+            writer.WritePropertyName("Terms");
+            serializer.Serialize(writer, value.Terms);
+
+            writer.WritePropertyName("Variables");
+            serializer.Serialize(writer, value.Variables);
+
+            writer.WritePropertyName("Logic");
+            serializer.Serialize(writer, value.LogicLookup.Values.Select(l => new RawLogicDef(l.Name, l.ToInfix())));
+
+            writer.WritePropertyName("Items");
+            serializer.Serialize(writer, value.ItemLookup.Values);
+
+            writer.WritePropertyName("Transitions");
+            serializer.Serialize(writer, value.TransitionLookup.Values.Select(t => t.ToRaw()));
+
+            writer.WritePropertyName("Waypoints");
+            serializer.Serialize(writer, value.Waypoints.Select(w => new RawLogicDef(w.Name, w.logic.ToInfix())));
+
+            writer.WritePropertyName(nameof(value.LP));
+            serializer.Serialize(writer, value.LP);
+
+            writer.WritePropertyName(nameof(value.VariableResolver));
+            serializer.Serialize(writer, value.VariableResolver);
+
+            writer.WriteEndObject();
+            serializer.Converters.Remove(ldc);
+            serializer.Converters.Remove(tc);
+        }
+    }
+}
diff --git a/RandomizerCore/Json/LogicDefConverter.cs b/RandomizerCore/Json/LogicDefConverter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using RandomizerCore.Logic;
 
 namespace RandomizerCore.Json

diff --git a/RandomizerCore/Json/TermConverter.cs b/RandomizerCore/Json/TermConverter.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using RandomizerCore.Logic;
 
 namespace RandomizerCore.Json

diff --git a/RandomizerCore/LogHelper.cs b/RandomizerCore/LogHelper.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 
 namespace RandomizerCore
 {

diff --git a/RandomizerCore/Logic/ILogicDef.cs b/RandomizerCore/Logic/ILogicDef.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace RandomizerCore.Logic
+namespace RandomizerCore.Logic
 {
     public interface ILogicDef
     {

diff --git a/RandomizerCore/Logic/ILogicProcessor.cs b/RandomizerCore/Logic/ILogicProcessor.cs
diff --git a/RandomizerCore/Logic/LogicCost.cs b/RandomizerCore/Logic/LogicCost.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace RandomizerCore.Logic
+namespace RandomizerCore.Logic
 {
     public abstract class LogicCost
     {

diff --git a/RandomizerCore/Logic/LogicInt.cs b/RandomizerCore/Logic/LogicInt.cs
@@ -1,12 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using static RandomizerCore.LogHelper;
-
-namespace RandomizerCore.Logic
+namespace RandomizerCore.Logic
 {
     public abstract class LogicInt
     {

diff --git a/RandomizerCore/Logic/LogicManager.cs b/RandomizerCore/Logic/LogicManager.cs
@@ -1,72 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json;
 using RandomizerCore.Json;
 using RandomizerCore.StringLogic;
-using static RandomizerCore.LogHelper;
+using System.Collections.ObjectModel;
 
 namespace RandomizerCore.Logic
 {
-    public class LMConverter : JsonConverter<LogicManager>
-    {
-        public override LogicManager ReadJson(JsonReader reader, Type objectType, LogicManager existingValue, bool hasExistingValue, JsonSerializer serializer)
-        {
-            LogicManagerBuilder lmb = new();
-            JObject lm = JObject.Load(reader);
-            lmb.LP = lm[nameof(LogicManager.LP)].ToObject<LogicProcessor>();
-            lmb.VariableResolver = lm[nameof(LogicManager.VariableResolver)].ToObject<VariableResolver>();
-
-            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Terms, lm["Terms"]);
-            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Waypoints, lm["Waypoints"]);
-            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Transitions, lm["Transitions"]);
-            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Locations, lm["Logic"]);
-            lmb.DeserializeJson(LogicManagerBuilder.JsonType.Items, lm["Items"]);
-
-            return new(lmb);
-        }
-
-        public override void WriteJson(JsonWriter writer, LogicManager value, JsonSerializer serializer)
-        {
-            writer.WriteStartObject();
-
-            TermConverter tc = new() { LM = value };
-            LogicDefConverter ldc = new() { LM = value };
-            serializer.Converters.Add(tc);
-            serializer.Converters.Add(ldc);
-
-            writer.WritePropertyName("Terms");
-            serializer.Serialize(writer, value.Terms);
-
-            writer.WritePropertyName("Variables");
-            serializer.Serialize(writer, value.Variables);
-
-            writer.WritePropertyName("Logic");
-            serializer.Serialize(writer, value.LogicLookup.Values.Select(l => new RawLogicDef(l.Name, l.ToInfix())));
-
-            writer.WritePropertyName("Items");
-            serializer.Serialize(writer, value.ItemLookup.Values);
-
-            writer.WritePropertyName("Transitions");
-            serializer.Serialize(writer, value.TransitionLookup.Values.Select(t => t.ToRaw()));
-
-            writer.WritePropertyName("Waypoints");
-            serializer.Serialize(writer, value.Waypoints.Select(w => new RawLogicDef(w.Name, w.logic.ToInfix())));
-
-            writer.WritePropertyName(nameof(value.LP));
-            serializer.Serialize(writer, value.LP);
-
-            writer.WritePropertyName(nameof(value.VariableResolver));
-            serializer.Serialize(writer, value.VariableResolver);
-
-            writer.WriteEndObject();
-            serializer.Converters.Remove(ldc);
-            serializer.Converters.Remove(tc);
-        }
-    }
-
     [JsonConverter(typeof(LMConverter))]
     public class LogicManager : ILogicManager
     {