Cleanup and commented for CR

qingsong99 · Jan 19, 2016 · d582eb2 · d582eb2
1 parent 2503210
commit d582eb2
Show file tree

Hide file tree

Showing 3 changed files with 207 additions and 187 deletions.
diff --git a/Source/CSEvalClient/CSEvalClient.csproj b/Source/CSEvalClient/CSEvalClient.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
+    <OutputPath>..\..\x64\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -42,7 +42,7 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+    <OutputPath>..\..\x64\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>

diff --git a/Source/CSEvalClient/Program.cs b/Source/CSEvalClient/Program.cs
@@ -15,41 +15,50 @@ class Program
     {
         private static void Main(string[] args)
         {
-            Environment.CurrentDirectory = Path.Combine(Environment.CurrentDirectory, @"..\..\Examples\Image\MNIST\Data\");
-            Console.WriteLine("Current Directory: {0}", Environment.CurrentDirectory);
+            try
+            {
+                Environment.CurrentDirectory = Path.Combine(Environment.CurrentDirectory, @"..\..\Examples\Image\MNIST\Data\");
+                Console.WriteLine("Current Directory: {0}", Environment.CurrentDirectory);
 
-            Console.WriteLine("Creating Model Evaluator...");
-            var model = new IEvaluateModelManagedF();
+                Console.WriteLine("Creating Model Evaluator...");
+                var model = new IEvaluateModelManagedF();
 
-            Console.WriteLine("Initializing Model Evaluator...");
-            string config = GetConfig();
-            model.Init(config);
+                Console.WriteLine("Initializing Model Evaluator...");
+                string config = GetConfig();
+                model.Init(config);
 
-            Console.WriteLine("Loading Model...");
-            string modelFilePath = Path.Combine(Environment.CurrentDirectory, @"..\Output\Models\01_OneHidden");
-            model.LoadModel(modelFilePath);
+                Console.WriteLine("Loading Model...");
+                string modelFilePath = Path.Combine(Environment.CurrentDirectory, @"..\Output\Models\01_OneHidden");
+                model.LoadModel(modelFilePath);
 
-            var inputs = GetDictionary("features", 28 * 28, 255);
-            var outputs = GetDictionary("ol.z", 10, 100);
+                var inputs = GetDictionary("features", 28 * 28, 255);
+                var outputs = GetDictionary("ol.z", 10, 100);
 
-            Console.WriteLine("Press <Enter> to begin evaluating.");
-            Console.ReadLine();
+                Console.WriteLine("Press <Enter> to begin evaluating.");
+                Console.ReadLine();
 
-            List<float> outputList = null;
-            for (int i = 0; i < 10; i++)
-            {
                 Console.WriteLine("Evaluating Model...");
-                outputList = model.Evaluate(inputs, "ol.z", 10);  // return results
+                List<float> outputList = null;
+                outputList = model.Evaluate(inputs, "ol.z", 10);    // return results
                 model.Evaluate(inputs, outputs);                    // Pass result structure
-            }
-
-            Console.WriteLine("Destroying Model...");
-            model.Destroy();
+                
+                Console.WriteLine("Destroying Model...");
+                model.Destroy();
+                model = null;
 
-            Console.WriteLine("Output contents:");
-            foreach (var item in outputs)
+                Console.WriteLine("Output contents:");
+                foreach (var item in outputs)
+                {
+                    Console.WriteLine("Output layer: {0}", item.Key);
+                    foreach (var entry in item.Value)
+                    {
+                        Console.WriteLine(entry);
+                    }
+                }
+            }
+            catch (Exception ex)
             {
-                Console.WriteLine(item);
+                Console.WriteLine("Error: {0}", ex);
             }
 
             Console.WriteLine("Press <Enter> to terminate.");