From f4b6d509caa985e535477eaa6c830e699c59000b Mon Sep 17 00:00:00 2001
From: Oceania2018 <haiping008@gmail.com>
Date: Wed, 30 Jan 2019 11:07:23 -0600
Subject: [PATCH] fix HelloWorld example exception.

---
 src/TensorFlowNET.Core/Python.cs                | 13 ++++++++++++-
 test/TensorFlowNET.Examples/HelloWorld.cs       |  4 ++--
 test/TensorFlowNET.Examples/LinearRegression.cs | 12 ++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/TensorFlowNET.Core/Python.cs b/src/TensorFlowNET.Core/Python.cs
index 6f5d304f..a1c377dd 100644
--- a/src/TensorFlowNET.Core/Python.cs
+++ b/src/TensorFlowNET.Core/Python.cs
@@ -1,4 +1,5 @@
-using System;
+using NumSharp.Core;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -51,6 +52,16 @@ namespace Tensorflow
                 py.Dispose();
             }
         }
+
+        public static (T, T) zip<T>(T t1, T t2, int index = 0) where T : IList<T>
+        {
+            return (t1[index], t2[index]);
+        }
+
+        public static (T, T) zip<T>(NDArray t1, NDArray t2, int index = 0)
+        {
+            return (t1.Data<T>(index), t2.Data<T>(index));
+        }
     }
 
     public interface IPython : IDisposable
diff --git a/test/TensorFlowNET.Examples/HelloWorld.cs b/test/TensorFlowNET.Examples/HelloWorld.cs
index ce600097..1c57d5ca 100644
--- a/test/TensorFlowNET.Examples/HelloWorld.cs
+++ b/test/TensorFlowNET.Examples/HelloWorld.cs
@@ -25,10 +25,10 @@ namespace TensorFlowNET.Examples
             {
                 // Run the op
                 var result = sess.run(hello);
-                Console.WriteLine(result);
+                Console.WriteLine(result.ToString());
                 if(!result.ToString().Equals("Hello, TensorFlow!"))
                 {
-                    throw new Exception("HelloWorld error");
+                    throw new ValueError("HelloWorld");
                 }
             }
         }
diff --git a/test/TensorFlowNET.Examples/LinearRegression.cs b/test/TensorFlowNET.Examples/LinearRegression.cs
index 3311b064..860036e0 100644
--- a/test/TensorFlowNET.Examples/LinearRegression.cs
+++ b/test/TensorFlowNET.Examples/LinearRegression.cs
@@ -59,6 +59,18 @@ namespace TensorFlowNET.Examples
             {
                 // Run the initializer
                 sess.run(init);
+
+                // Fit all training data
+                for (int i = 0; i < training_epochs; i++)
+                {
+                    for(int index = 0; index < train_X.size; index++)
+                    {
+                        (double x, double y) = Python.zip<double>(train_X, train_Y, index);
+                        var feed_dict = new Dictionary<Tensor, NDArray>();
+
+                        // sess.run(optimizer, feed_dict);
+                    }
+                }
             });
         }
     }