Code Contract Enforcement

.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.suo
 ConsoleExamples/bin/
 ConsoleExamples/obj/

ConsoleExamples/ConsoleExamples.cs

@@ -1,8 +1,8 @@
 //
-// Encog(tm) Core v3.1 - .Net Version
+// Encog(tm) Core v3.2 - .Net Version
 // http://www.heatonresearch.com/encog/
 //
-// Copyright 2008-2012 Heaton Research, Inc.
+// Copyright 2008-2014 Heaton Research, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -22,39 +22,11 @@
 //
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using ConsoleExamples.Examples;
 using Encog.Examples;
-using Encog.Examples.Adaline;
-using Encog.Examples.Analyst;
-using Encog.Examples.Analyzer;
-using Encog.Examples.AnnealTSP;
-using Encog.Examples.ARTExample;
-using Encog.Examples.BAM;
-using Encog.Examples.Benchmark;
-using Encog.Examples.Boltzmann;
-using Encog.Examples.CPN;
-using Encog.Examples.ElmanNetwork;
-using Encog.Examples.Forest;
-using Encog.Examples.GeneticTSP;
-using Encog.Examples.Hopfield.Associate;
-using Encog.Examples.Hopfield.Simple;
-using Encog.Examples.Image;
-using Encog.Examples.JordanNetwork;
-using Encog.Examples.Lunar;
-using Encog.Examples.Market;
-using Encog.Examples.MultiRadial;
-using Encog.Examples.NetWorkPruner;
-using Encog.Examples.Normalize;
-using Encog.Examples.Persist;
-using Encog.Examples.Predict;
-using Encog.Examples.RangeandMarket;
-using Encog.Examples.RateSP500;
-using Encog.Examples.SVM_Predict;
-using Encog.Examples.SVMPredictCSV;
-using Encog.Examples.XOR;
-using Encog.Examples.CSVMarketExample;
-using Encog.Examples.ForexExample;
-using Encog.Examples.Bayesian;
+using System.Reflection;
+
 namespace ConsoleExamples
 {
     /// <summary>
@@ -71,46 +43,21 @@ public class ConsoleExamples
 
         public ConsoleExamples()
         {
-            examples.Add(AdalineDigits.Info);
-            examples.Add(SolveTSP.Info);
-            examples.Add(ClassifyART1.Info);
-            examples.Add(BidirectionalAssociativeMemory.Info);
-            examples.Add(EncogBenchmarkExample.Info);
-            examples.Add(BoltzTSP.Info);
-            examples.Add(RocketCPN.Info);
-            examples.Add(ElmanExample.Info);
-            examples.Add(GeneticSolveTSP.Info);
-            examples.Add(HopfieldSimple.Info);
-            examples.Add(HopfieldAssociate.Info);
-            examples.Add(JordanExample.Info);
-            examples.Add(MultiThreadBenchmark.Info);
-            examples.Add(ImageNeuralNetwork.Info);
-            examples.Add(PersistEncog.Info);
-            examples.Add(PersistSerial.Info);
-            examples.Add(WeightInitialization.Info);
-            examples.Add(ThreadCount.Info);
-            examples.Add(SimpleBenchmark.Info);
-            examples.Add(XORFactory.Info);
-            examples.Add(XORHelloWorld.Info);
-            examples.Add(AnalystExample.Info);
-            examples.Add(XORNEAT.Info);
-            examples.Add(ForestCover.Info);
-            examples.Add(Encog.Examples.Market.MarketPredict.Info);
-            examples.Add(CSVMarketExample.Info);
-            examples.Add(ForexExample.Info);
-            examples.Add(LunarLander.Info);
-            examples.Add(MarketAnalyzer.Info);
-            examples.Add(PrunerLoader.Info);
-            examples.Add(MultiRadial.Info);
-            examples.Add(SVMExample.Info);
-            examples.Add(SVMPredictCSV.Info);
-            examples.Add(FahlmanEncoder.Info);
-            examples.Add(PredictSunspot.Info);
-            examples.Add(SimpleNormalize.Info);
-            examples.Add(NormalizeFile.Info);
-            examples.Add(ElliottBenchmark.Info);
-            examples.Add(XORPSO.Info);
-            examples.Add(BayesianTaxi.Info);
+            const string method = "get_Info";
+            var exampleTypes = Assembly
+                    .GetExecutingAssembly()
+                    .GetTypes().ToList()
+                    .Where(t => t.Namespace != null && t.Namespace.StartsWith("Encog.Examples")).ToList();
+
+            exampleTypes
+                .ForEach(e =>
+                {
+                    if (e.GetMembers().Any(m => m.Name == method))
+                    {
+                        var info = e.InvokeMember(method, BindingFlags.Default | BindingFlags.InvokeMethod, null, null, new object[] { });
+                        examples.Add((ExampleInfo)info);
+                    }
+                });
         }
 
         public void ListCommands()
@@ -194,9 +141,10 @@ public void Execute(String[] args)
 
         public void Pause()
         {
-            Console.Write("\n\nPress ENTER to continue.");
-            Console.ReadLine();
+            Console.Write("\n\nPress any key to continue...");
+            Console.ReadKey();
         }
+
         [STAThread]
         private static void Main(string[] args)
         {

ConsoleExamples/ConsoleExamples.csproj

@@ -65,23 +65,41 @@
     <Compile Include="Examples\Benchmark\ThreadCount.cs" />
     <Compile Include="Examples\Benchmark\WeightInitialization.cs" />
     <Compile Include="Examples\Analyzer\CreateEval.cs" />
+    <Compile Include="Examples\EPL\SimpleEPL.cs" />
+    <Compile Include="Examples\ExampleTest.cs" />
     <Compile Include="Examples\Forest\Evaluate.cs" />
     <Compile Include="Examples\Forest\ForestConfig.cs" />
     <Compile Include="Examples\Forest\ForestCover.cs" />
     <Compile Include="Examples\Forest\GenerateData.cs" />
     <Compile Include="Examples\Forest\TrainNetwork.cs" />
-    <Compile Include="Examples\ForexExample\markettrain.cs" />
+    <Compile Include="Examples\ForexExample\ForexMarketTrain.cs" />
+    <Compile Include="Examples\Freeform\ConvertToFreeform.cs" />
+    <Compile Include="Examples\Freeform\ElmanFreeform.cs" />
+    <Compile Include="Examples\Freeform\FreeformOnlineXOR.cs" />
+    <Compile Include="Examples\Freeform\FreeformXOR.cs" />
+    <Compile Include="Examples\Freeform\SkipNeuralNetwork.cs" />
     <Compile Include="Examples\GeneticTSP\GeneticSolveTSP.cs" />
-    <Compile Include="Examples\GeneticTSP\ICalculateGenomeScore.cs" />
-    <Compile Include="Examples\GeneticTSP\TSPGenome.cs" />
     <Compile Include="Examples\GeneticTSP\TSPScore.cs" />
+    <Compile Include="Examples\Guide\Classification\IrisClassification.cs" />
+    <Compile Include="Examples\Guide\Regression\AutoMPGRegression.cs" />
+    <Compile Include="Examples\Guide\Timeseries\SunSpotTimeseries.cs" />
     <Compile Include="Examples\Hopfield\Associate\HopfieldAssociate.cs" />
     <Compile Include="Examples\Hopfield\Simple\HopfieldSimple.cs" />
     <Compile Include="Examples\Image\ImageNeuralNetwork.cs" />
     <Compile Include="Examples\Image\ImagePair.cs" />
+    <Compile Include="Examples\Indicator\CustomInd\EMA.cs" />
+    <Compile Include="Examples\Indicator\CustomInd\RemoteEMA.cs" />
+    <Compile Include="Examples\Indicator\Avg\Config.cs" />
+    <Compile Include="Examples\Indicator\Avg\GenerateTraining.cs" />
+    <Compile Include="Examples\Indicator\Avg\IndicatorExample.cs" />
+    <Compile Include="Examples\Indicator\ImportData\MyInd.cs" />
+    <Compile Include="Examples\Indicator\ImportData\ImportIndicatorData.cs" />
+    <Compile Include="Examples\Iris\IrisPredict.cs" />
     <Compile Include="Examples\JordanNetwork\JordanExample.cs" />
+    <Compile Include="Examples\LiveSimul\LiveSimul.cs" />
     <Compile Include="Examples\Lunar\LanderSimulator.cs" />
     <Compile Include="Examples\Lunar\LunarLander.cs" />
+    <Compile Include="Examples\Lunar\MLResettable.cs" />
     <Compile Include="Examples\Lunar\NeuralPilot.cs" />
     <Compile Include="Examples\Lunar\PilotScore.cs" />
     <Compile Include="Examples\Analyzer\MarketAnalyzer.cs" />
@@ -103,11 +121,15 @@
     <Compile Include="Examples\NetWorkPruner\PrunerLoader.cs" />
     <Compile Include="Examples\Normalize\NormalizeFile.cs" />
     <Compile Include="Examples\Normalize\SimpleNormalize.cs" />
-    <Compile Include="Examples\Persist\PersistEncog.cs" />
-    <Compile Include="Examples\Persist\PersistSerial.cs" />
+    <Compile Include="Examples\Playground\PlaygroundExample.cs" />
+    <Compile Include="Examples\SVM\RegressionSVM.cs" />
+    <Compile Include="Examples\XOR\XOROnline.cs" />
+    <Compile Include="Persist\PersistEncog.cs" />
+    <Compile Include="Persist\PersistSerial.cs" />
     <Compile Include="Examples\Analyzer\Prunes.cs" />
     <Compile Include="Examples\Analyzer\RandomTrainer.cs" />
     <Compile Include="Examples\Predict\PredictSunspot.cs" />
+    <Compile Include="Examples\Predict\SunspotWindow.cs" />
     <Compile Include="Examples\RateSP500\FinancialSample.cs" />
     <Compile Include="Examples\RateSP500\InterestRate.cs" />
     <Compile Include="Examples\RateSP500\PredictSP500.cs" />
@@ -156,9 +178,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="DB!EURUSD.Bar.Time.600.csv">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

ConsoleExamples/ConsoleExamples.csproj.user

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <StartArguments>-pause benchmark-simple</StartArguments>
+    <StartArguments>-pause iris</StartArguments>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <StartArguments>-pause benchmark-simple</StartArguments>
+    <StartArguments>-pause playground</StartArguments>
   </PropertyGroup>
 </Project>