[#2, #3, #6]: refit for [#1]

3k-dome · May 5, 2023 · 66197d6 · 66197d6
1 parent 2210647
commit 66197d6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/catan-lib/Parts/EdgeTile.cs b/catan-lib/Parts/EdgeTile.cs
@@ -1,5 +1,5 @@
 using CatanLib.Enums;
-using CatanLib.Interfaces;
+using CatanLib.Interfaces.Components;
 using HexagonLib;
 
 namespace CatanLib.Parts
@@ -50,7 +50,10 @@ public IEnumerable<string> ToExplainedVector()
             return descriptions;
         }
 
-        public IEnumerable<float> ToVector()
+        public IEnumerable<float> ToVector<TSettlement, TRoad, TDice>(Catan<TSettlement, TRoad, TDice> catan)
+            where TSettlement : ISettlement, new()
+            where TRoad : IRoad, new()
+            where TDice : IDice, new()
         {
             return TradeEncoding;
         }

diff --git a/catan-lib/Parts/ProductionCircle.cs b/catan-lib/Parts/ProductionCircle.cs
@@ -1,4 +1,4 @@
-using CatanLib.Interfaces;
+using CatanLib.Interfaces.Components;
 
 namespace CatanLib.Parts
 {
@@ -23,14 +23,12 @@ public float[] Encoding
             }
         }
 
-        public IEnumerable<float> ToVector()
+        public IEnumerable<float> ToVector<TSettlement, TRoad, TDice>(Catan<TSettlement, TRoad, TDice> catan)
+            where TSettlement : ISettlement, new()
+            where TRoad : IRoad, new()
+            where TDice : IDice, new()
         {
             return Encoding;
         }
-
-        public IEnumerable<string> ToExplainedVector()
-        {
-            return new string[] { "NormalizedDiceRoll", "OddsOfDiceRoll" };
-        }
     }
 }
diff --git a/catan-lib/Parts/TerrainTile.cs b/catan-lib/Parts/TerrainTile.cs
@@ -1,5 +1,5 @@
 using CatanLib.Enums;
-using CatanLib.Interfaces;
+using CatanLib.Interfaces.Components;
 using HexagonLib;
 
 namespace CatanLib.Parts
@@ -56,11 +56,14 @@ public IEnumerable<string> ToExplainedVector()
             return vector;
         }
 
-        public IEnumerable<float> ToVector()
+        public IEnumerable<float> ToVector<TSettlement, TRoad, TDice>(Catan<TSettlement, TRoad, TDice> catan)
+        where TSettlement : ISettlement, new()
+        where TRoad : IRoad, new()
+        where TDice : IDice, new()
         {
             IEnumerable<float> vector = Enumerable.Empty<float>();
             vector = vector.Concat(TerrainEncoding);
-            vector = vector.Concat(Production.ToVector());
+            vector = vector.Concat(Production.ToVector(catan));
             return vector;
         }
     }