Merge pull request #56 from Exouxas/38-fix-null-related-warnings

Fix null related warnings
Exouxas · Oct 20, 2023 · 8cc6708 · 8cc6708
2 parents bb87899 + 4ea426d
commit 8cc6708
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 21 deletions.
diff --git a/src/Core/Agents/Module.cs b/src/Core/Agents/Module.cs
@@ -43,8 +43,8 @@ public Module()
         protected Module(SerializationInfo info, StreamingContext context) : this()
         {
             Body = (Actor?)info.GetValue(nameof(Body), typeof(Actor));
-            Dependencies = (Dictionary<string, int[]>)info.GetValue(nameof(Dependencies), typeof(Dictionary<string, int[]>));
-            DependencyReferences = (Dictionary<string, Module>)info.GetValue(nameof(DependencyReferences), typeof(Dictionary<string, Module>));
+            Dependencies = (Dictionary<string, int[]>)(info.GetValue(nameof(Dependencies), typeof(Dictionary<string, int[]>)) ?? throw new SerializationException());
+            DependencyReferences = (Dictionary<string, Module>)(info.GetValue(nameof(DependencyReferences), typeof(Dictionary<string, Module>)) ?? throw new SerializationException());
         }
 
         public override void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/NeuralNetwork/Brain.cs b/src/Core/NeuralNetwork/Brain.cs
@@ -39,9 +39,9 @@ public Brain()
         /// <param name="context">The current deserialization context.</param>
         protected Brain(SerializationInfo info, StreamingContext context)
         {
-            SupplementingNodes = (List<ICanSupplement>)info.GetValue(nameof(SupplementingNodes), typeof(List<ICanSupplement>));
-            AugmentingNodes = (List<ICanAugment>)info.GetValue(nameof(AugmentingNodes), typeof(List<ICanAugment>));
-            NeuralConnections = (List<NeuralConnection>)info.GetValue(nameof(NeuralConnections), typeof(List<NeuralConnection>));
+            SupplementingNodes = (List<ICanSupplement>)(info.GetValue(nameof(SupplementingNodes), typeof(List<ICanSupplement>)) ?? throw new SerializationException());
+            AugmentingNodes = (List<ICanAugment>)(info.GetValue(nameof(AugmentingNodes), typeof(List<ICanAugment>)) ?? throw new SerializationException());
+            NeuralConnections = (List<NeuralConnection>)(info.GetValue(nameof(NeuralConnections), typeof(List<NeuralConnection>)) ?? throw new SerializationException());
         }
 
         /// <summary>

diff --git a/src/Core/NeuralNetwork/HiddenNode.cs b/src/Core/NeuralNetwork/HiddenNode.cs
@@ -17,7 +17,7 @@ protected HiddenNode(string name, string description) : base(name, description)
 
         protected HiddenNode(SerializationInfo info, StreamingContext context) : base(info, context)
         {
-            Inputs = (List<NeuralConnection>)info.GetValue(nameof(Inputs), typeof(List<NeuralConnection>));
+            Inputs = (List<NeuralConnection>)(info.GetValue(nameof(Inputs), typeof(List<NeuralConnection>)) ?? throw new SerializationException());
         }
 
         public override void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/NeuralNetwork/InputNode.cs b/src/Core/NeuralNetwork/InputNode.cs
@@ -24,8 +24,8 @@ public double Output
 
         protected InputNode(SerializationInfo info, StreamingContext context) : base(info, context)
         {
-            output = (double)info.GetValue(nameof(Output), typeof(double));
-            storedOutput = (double)info.GetValue(nameof(storedOutput), typeof(double));
+            output = (double)(info.GetValue(nameof(Output), typeof(double)) ?? throw new SerializationException());
+            storedOutput = (double)(info.GetValue(nameof(storedOutput), typeof(double)) ?? throw new SerializationException());
         }
 
         public override void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/NeuralNetwork/NeuralConnection.cs b/src/Core/NeuralNetwork/NeuralConnection.cs
@@ -53,9 +53,9 @@ public NeuralConnection(ICanSupplement from, ICanAugment to, double weight)
 
         public NeuralConnection(SerializationInfo info, StreamingContext context)
         {
-            From = (ICanSupplement)info.GetValue(nameof(From), typeof(ICanSupplement));
-            To = (ICanAugment)info.GetValue(nameof(To), typeof(ICanAugment));
-            weight = (double)info.GetValue(nameof(Weight), typeof(double));
+            From = (ICanSupplement)(info.GetValue(nameof(From), typeof(ICanSupplement)) ?? throw new SerializationException());
+            To = (ICanAugment)(info.GetValue(nameof(To), typeof(ICanAugment)) ?? throw new SerializationException());
+            weight = (double)(info.GetValue(nameof(Weight), typeof(double)) ?? throw new SerializationException());
         }
 
         public void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/NeuralNetwork/Neuron.cs b/src/Core/NeuralNetwork/Neuron.cs
@@ -34,8 +34,8 @@ protected Neuron(string name, string description)
 
         protected Neuron(SerializationInfo info, StreamingContext context)
         {
-            _name = (string)info.GetValue(nameof(Name), typeof(string));
-            _description = (string)info.GetValue(nameof(Description), typeof(string));
+            _name = (string)(info.GetValue(nameof(Name), typeof(string)) ?? throw new SerializationException());
+            _description = (string)(info.GetValue(nameof(Description), typeof(string)) ?? throw new SerializationException());
         }
 
         public virtual void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/NeuralNetwork/OutputNode.cs b/src/Core/NeuralNetwork/OutputNode.cs
@@ -33,7 +33,7 @@ public OutputNode(string name, string description) : base(name, description)
 
         protected OutputNode(SerializationInfo info, StreamingContext context) : base(info, context)
         {
-            Inputs = (List<NeuralConnection>)info.GetValue(nameof(Inputs), typeof(List<NeuralConnection>));
+            Inputs = (List<NeuralConnection>)(info.GetValue(nameof(Inputs), typeof(List<NeuralConnection>)) ?? throw new SerializationException());
         }
 
         public override void GetObjectData(SerializationInfo info, StreamingContext context)

diff --git a/src/Core/Worlds/World.cs b/src/Core/Worlds/World.cs
@@ -122,13 +122,13 @@ protected World()
 
         internal World(SerializationInfo info, StreamingContext context)
         {
-            _currentStep = (long)info.GetValue(nameof(_currentStep), typeof(long));
-            _actorsToBeRemoved = (List<Actor>)info.GetValue(nameof(_actorsToBeRemoved), typeof(List<Actor>));
-            _actors = (List<Actor>)info.GetValue(nameof(_actors), typeof(List<Actor>));
-            _actorRemoveLock = (object)info.GetValue(nameof(_actorRemoveLock), typeof(object));
-            _actorLock = (object)info.GetValue(nameof(_actorLock), typeof(object));
-            _positionsLock = (object)info.GetValue(nameof(_positionsLock), typeof(object));
-            positions = (Dictionary<Actor, Vector3>)info.GetValue(nameof(positions), typeof(Dictionary<Actor, Vector3>));
+            _currentStep = (long)(info.GetValue(nameof(_currentStep), typeof(long)) ?? throw new SerializationException());
+            _actorsToBeRemoved = (List<Actor>)(info.GetValue(nameof(_actorsToBeRemoved), typeof(List<Actor>)) ?? throw new SerializationException());
+            _actors = (List<Actor>)(info.GetValue(nameof(_actors), typeof(List<Actor>)) ?? throw new SerializationException());
+            _actorRemoveLock = (object)(info.GetValue(nameof(_actorRemoveLock), typeof(object)) ?? throw new SerializationException());
+            _actorLock = (object)(info.GetValue(nameof(_actorLock), typeof(object)) ?? throw new SerializationException());
+            _positionsLock = (object)(info.GetValue(nameof(_positionsLock), typeof(object)) ?? throw new SerializationException());
+            positions = (Dictionary<Actor, Vector3>)(info.GetValue(nameof(positions), typeof(Dictionary<Actor, Vector3>)) ?? throw new SerializationException());
         }
 
         public virtual void GetObjectData(SerializationInfo info, StreamingContext context)