changed material settings to use own class

ericoldre · ericoldre · commit 69503c02caec · 2014-08-27T07:48:26.000-05:00
diff --git a/NoraGrace/NoraGrace.Engine/Evaluation/MaterialEvaluator.cs b/NoraGrace/NoraGrace.Engine/Evaluation/MaterialEvaluator.cs
@@ -8,6 +8,11 @@
 namespace NoraGrace.Engine.Evaluation
 {
 
+    public class MaterialSettings : ChessGameStageDictionary<MaterialSettingsPhase>
+    {
+        
+
+    }
     public class MaterialSettingsPhase
     {
 
@@ -100,13 +105,13 @@ public bool DoShelter
     public class MaterialEvaluator
     {
 
-        protected readonly ChessGameStageDictionary<MaterialSettingsPhase>  _settings;
+        protected readonly MaterialSettings _settings;
         private readonly MaterialResults[] _hash = new MaterialResults[500];
         public static int TotalEvalMaterialCount = 0;
 
         private int[] _pawnValuesOpening;
         private int[] _pawnValuesEndGame;
-        public MaterialEvaluator(ChessGameStageDictionary<MaterialSettingsPhase> settings)
+        public MaterialEvaluator(MaterialSettings settings)
         {
             _settings = settings;
 
@@ -167,6 +172,8 @@ public MaterialResults EvalMaterial(Int64 zob, int wp, int wn, int wb, int wr, i
 
             double scaleWhite = ScaleFactor(wp, wn, wb, wr, wq, bp, bn, bb, br, bq);
             double scaleBlack = ScaleFactor(bp, bn, bb, br, bq, wp, wn, wb, wr, wq);
+
+
             return new MaterialResults(zob, startWeight, (int)score, (int)(scaleWhite * 100), (int)(scaleBlack * 100));
 
         }
diff --git a/NoraGrace/NoraGrace.Engine/Evaluation/Settings.cs b/NoraGrace/NoraGrace.Engine/Evaluation/Settings.cs
@@ -132,7 +132,7 @@ public static Settings Default()
                 //},
                 //MaterialBishopPair = new ChessGameStageDictionary<int>() { Opening = 25, Endgame = 75 },
 
-                MaterialValues = new ChessGameStageDictionary<MaterialSettingsPhase>()
+                MaterialValues = new MaterialSettings()
                 {
                     Opening = new MaterialSettingsPhase()
                     {
@@ -150,6 +150,7 @@ public static Settings Default()
                         Rook = new MaterialSettingsPhase.PieceSettings() { BaseValue = 550, PairBonus = 0 },
                         Queen = new MaterialSettingsPhase.PieceSettings() { BaseValue = 1100, PairBonus = 0 }
                     }
+                    
                 },
 
                 PcSqTables = new ChessPieceTypeDictionary<ChessGameStageDictionary<PcSqDictionary>>()
@@ -405,6 +406,7 @@ public static Settings Default()
                 KingRingAttackControlBonus = 25,
                 KingAttackFactor = .53,
                 KingAttackFactorQueenTropismBonus = 2.15f,
+                
 
                 Mobility = new ChessPieceTypeDictionary<ChessGameStageDictionary<Helpers.Mobility>>()
                 {
@@ -439,7 +441,7 @@ public static Settings Default()
 
 
         public ChessPieceTypeDictionary<ChessGameStageDictionary<PcSqDictionary>> PcSqTables = new ChessPieceTypeDictionary<ChessGameStageDictionary<PcSqDictionary>>();
-        public ChessGameStageDictionary<MaterialSettingsPhase> MaterialValues = new ChessGameStageDictionary<MaterialSettingsPhase>();
+        public MaterialSettings MaterialValues = new MaterialSettings();
         public ChessGameStageDictionary<int> MaterialBishopPair = new ChessGameStageDictionary<int>();
 
         public ChessGameStageDictionary<int> PawnDoubled = new ChessGameStageDictionary<int>();

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,11 @@`
`8`	`8`	`namespace NoraGrace.Engine.Evaluation`
`9`	`9`	`{`
`10`	`10`
	`11`	`+ public class MaterialSettings : ChessGameStageDictionary<MaterialSettingsPhase>`
	`12`	`+ {`
	`13`	`+`
	`14`	`+`
	`15`	`+ }`
`11`	`16`	`public class MaterialSettingsPhase`
`12`	`17`	`{`
`13`	`18`
`@@ -100,13 +105,13 @@ public bool DoShelter`
`100`	`105`	`public class MaterialEvaluator`
`101`	`106`	`{`
`102`	`107`
`103`		`- protected readonly ChessGameStageDictionary<MaterialSettingsPhase> _settings;`
	`108`	`+ protected readonly MaterialSettings _settings;`
`104`	`109`	`private readonly MaterialResults[] _hash = new MaterialResults[500];`
`105`	`110`	`public static int TotalEvalMaterialCount = 0;`
`106`	`111`
`107`	`112`	`private int[] _pawnValuesOpening;`
`108`	`113`	`private int[] _pawnValuesEndGame;`
`109`		`- public MaterialEvaluator(ChessGameStageDictionary<MaterialSettingsPhase> settings)`
	`114`	`+ public MaterialEvaluator(MaterialSettings settings)`
`110`	`115`	`{`
`111`	`116`	`_settings = settings;`
`112`	`117`
`@@ -167,6 +172,8 @@ public MaterialResults EvalMaterial(Int64 zob, int wp, int wn, int wb, int wr, i`
`167`	`172`
`168`	`173`	`double scaleWhite = ScaleFactor(wp, wn, wb, wr, wq, bp, bn, bb, br, bq);`
`169`	`174`	`double scaleBlack = ScaleFactor(bp, bn, bb, br, bq, wp, wn, wb, wr, wq);`
	`175`	`+`
	`176`	`+`
`170`	`177`	`return new MaterialResults(zob, startWeight, (int)score, (int)(scaleWhite * 100), (int)(scaleBlack * 100));`
`171`	`178`
`172`	`179`	`}`