upgraded labels

Author: snorthman

src/SharpNeatDomains/IPD/IPDDomain.cs

@@ -13,28 +13,28 @@ namespace SharpNeat.Domains.IPD
 {
     partial class IPDDomain : AbstractDomainView
     {
-        public override Size WindowSize => new Size(_tableSize.Width + _graphSize.Width + 50, 90 + Math.Max(_tableSize.Height, _graphSize.Height));
+        public override Size WindowSize => new Size(_tableSize.Width + _graphSize.Width + 50, 120 + Math.Max(_tableSize.Height, _graphSize.Height));
 
         private IGenomeDecoder<NeatGenome, IBlackBox> _genomeDecoder;
         private IPDExperiment.Info _info;        
         private IPDPlayer[] _players;
         private IPDGame[,] _games;
-
-        private System.Windows.Forms.Label _label;
+        
         private Size _labelSize = new Size(1400, 30);
-        private Point _labelLocation = new Point(10, 10);
+        private Point _label1Location = new Point(10, 10);
+        private Point _label2Location = new Point(10, 40);
 
         private DataGridView _table;
         private Size _tableSize = new Size(700, 700);
-        private Point _tableLocation = new Point(10, 40);
+        private Point _tableLocation = new Point(10, 70);
         private ToolStripMenuItem _history;
         private ToolStripMenuItem _save;
         private DataGridViewColumn _cumulative;
         private DataGridViewColumn _rankings;
 
         private ZedGraphControl _graphArchive;
         private Size _graphSize = new Size(700, 700);
-        private Point _graphLocation = new Point(720, 40);
+        private Point _graphLocation = new Point(720, 70);
 
         public IPDDomain(IGenomeDecoder<NeatGenome, IBlackBox> genomeDecoder, ref IPDExperiment.Info info)
         {
@@ -95,23 +95,50 @@ public override void RefreshView(object genome)
 
         private void CreateInfoLabel()
         {
-            _label = new System.Windows.Forms.Label();
-            _label.Size = _labelSize;
-            _label.Location = _labelLocation;
-            _label.Font = new Font(_label.Font.FontFamily, 12);
+            var label1 = new System.Windows.Forms.Label();
+            label1.Size = _labelSize;
+            label1.Location = _label1Location;
+            label1.Font = new Font(label1.Font.FontFamily, 12);
 
-            _label.Text = "Generation "
+            label1.Text =
+                  "Generation "
                 + _info.CurrentGeneration
-                + ", <"
-                + _info.EvaluationMode
-                + "> Evaluation Mode, <"
-                + _info.NoveltyMetric 
-                + "> Novelty Metric with KNN-"
-                + _info.NoveltyK
-                + ", can look back t-"
-                + _info.InputCount / 2
-                + " steps in history";
-            Controls.Add(_label);
+                + "; "
+                + _info.Evaluations()
+                + " evaluations; "
+                + _info.PopulationSize
+                + " genomes; "
+                + _info.NumberOfGames
+                + " iterated games per opponent";
+
+            var label2 = new System.Windows.Forms.Label();
+            label2.Size = _labelSize;
+            label2.Location = _label2Location;
+            label2.Font = new Font(label2.Font.FontFamily, 10);
+
+            if (_info.EvaluationMode == IPDExperiment.EvaluationMode.Novelty)
+            {
+                label2.Text =
+                      "("
+                    + _info.EvaluationMode
+                    + ") Evaluation Mode, ("
+                    + _info.NoveltyMetric
+                    + ") Novelty Metric with KNN-"
+                    + _info.NoveltyK
+                    + ", memory-"
+                    + _info.InputCount / 2;
+            }
+            else
+            {
+                label2.Text =
+                      "("
+                    + _info.EvaluationMode
+                    + ") Evaluation Mode, memory-"
+                    + _info.InputCount / 2;
+            }
+
+            Controls.Add(label1);
+            Controls.Add(label2);
         }
 
         private void CreateArchiveGraph()
@@ -188,7 +215,7 @@ private void UpdateArchiveGraph()
             ar.Line.Width = 3;
 
             var t = g.AddCurve("Top Score", topScore, Color.Purple, SymbolType.Square);
-            t.Line.Width = 3;
+            t.Line.Width = 2;
 
             var s = g.AddCurve("Score", ii, score, Color.Maroon, SymbolType.HDash);
             s.Line.IsVisible = false;

src/SharpNeatDomains/IPD/IPDEvaluator.cs

@@ -32,6 +32,7 @@ public IPDEvaluator(ref IPDExperiment.Info info)
             _info = info;
             _info.BestNoveltyGenome = () => { var m = _archive.Max(); return m.Phenome; };
             _info.Archive = () => { return _archive; };
+            _info.Evaluations = () => { return EvaluationCount; };
             PhenomeInfo.Initialize(info);
         }
 
@@ -60,12 +61,12 @@ public FitnessInfo Evaluate(IBlackBox phenome)
 
             lock (_stopLock)
             {
-                if (EvaluationCount == 500000)
+                if (_info.CurrentGeneration == 500)
                     _stopConditionSatisfied = true;
             }
 
             return new FitnessInfo(primaryFitness, pi.AuxiliaryFitnessInfo);
-            //graph of _archive, sohuld be easy..
+            
             //if (_info.EvaluationMode == IPDExperiment.EvaluationMode.Rank && pi.Rank == 1.0d && gen > 0)
             //{
             //    lock (_stopLock)

src/SharpNeatDomains/IPD/IPDExperiment.cs

@@ -340,6 +340,7 @@ public class Info
 
             public int PopulationSize { get { return _exp._populationSize; } }
             public int CurrentGeneration { get { return (int)_genGet(); } }
+            public System.Func<ulong> Evaluations { get; set; }
             public System.Func<IBlackBox> BestNoveltyGenome { get; set; }
             public IBlackBox BestGenome { get { return _boxGet(); } }
             public double BestFitness { get { return _fitGet(); } }

src/SharpNeatDomains/IPD/Players/IPDPlayerAdaptive.cs

@@ -23,7 +23,6 @@ public IPDPlayerAdaptive()
 
         public override IPDGame.Choices Choice(IPDGame game)
         {
-            IPDGame.Choices r;
             IPDGame.Choices pr;
             int prt = game.T - 1;
 

src/SharpNeatDomains/SharpNeatDomains.experiments.xml

@@ -19,7 +19,7 @@
       <RandomPlayerSeed>9865</RandomPlayerSeed>
       <RandomPlayerCount>0</RandomPlayerCount>
       <RandomRobustCheck>100</RandomRobustCheck>
-      <StaticOpponents>ZD_2,ZD_2</StaticOpponents>
+      <StaticOpponents>ZDGTFT_2,ZDGTFT_2</StaticOpponents>
       <!--
             AllC,
             AllD,
@@ -39,7 +39,7 @@
             CD,
             DC
         -->
-      <EvaluationMode>Score</EvaluationMode>
+      <EvaluationMode>Novelty</EvaluationMode>
       <!--
           Score,  (objective)
           Rank,   (objective)