added nuget sources in generated csproj (dotnet#262)

* added nuget sources in csproj * changed the structure in generated code * space
Dmitry-A · Mar 5, 2019 · 1a5161d · 1a5161d
1 parent 3acd887
commit 1a5161d
Show file tree

Hide file tree

Showing 6 changed files with 75 additions and 18 deletions.
diff --git a/src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedProjectCodeTest.approved.txt b/src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedProjectCodeTest.approved.txt
@@ -5,6 +5,12 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="ConsoleHelper.cs" />

diff --git a/src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedTrainCodeTest.approved.txt b/src/mlnet.Test/ApprovalTests/ConsoleCodeGeneratorTests.GeneratedTrainCodeTest.approved.txt
@@ -26,15 +26,28 @@ namespace MyNamespace
             // Create MLContext to be shared across the model creation workflow objects 
             var mlContext = new MLContext();
 
-            // (Optional step) Create, Train, Evaluate and Save the model.zip file
-            TrainEvaluateAndSaveModel(mlContext);
+            var command = Command.Predict; // Your desired action here
 
-            // Make a single test prediction loading the model from model.zip file
-            Predict(mlContext);
+            if (command == Command.Predict)
+            {
+                Predict(mlContext);
+                ConsoleHelper.ConsoleWriteHeader("=============== If you also want to train a model use Command.TrainAndPredict  ===============");
+            }
 
-            ConsoleHelper.ConsoleWriteHeader("=============== End of process, hit any key to finish ===============");
+            if (command == Command.TrainAndPredict)
+            {
+                TrainEvaluateAndSaveModel(mlContext);
+                Predict(mlContext);
+            }
+
+            Console.WriteLine("=============== End of process, hit any key to finish ===============");
             Console.ReadKey();
+        }
 
+        private enum Command
+        {
+            Predict,
+            TrainAndPredict
         }
 
         private static ITransformer TrainEvaluateAndSaveModel(MLContext mlContext)
@@ -77,7 +90,7 @@ namespace MyNamespace
                 mlContext.Model.Save(trainedModel, fs);
 
             Console.WriteLine("The model is saved to {0}", ModelPath);
-            ConsoleHelper.ConsoleWriteHeader("=============== End of training process ===============");
+            Console.WriteLine("=============== End of training process ===============");
 
             return trainedModel;
         }

diff --git a/src/mlnet/Templates/Console/MLCodeGen.cs b/src/mlnet/Templates/Console/MLCodeGen.cs
@@ -60,15 +60,28 @@ static void Main(string[] args)
             // Create MLContext to be shared across the model creation workflow objects 
             var mlContext = new MLContext();
 
-            // (Optional step) Create, Train, Evaluate and Save the model.zip file
-            TrainEvaluateAndSaveModel(mlContext);
+            var command = Command.Predict; // Your desired action here
 
-            // Make a single test prediction loading the model from model.zip file
-            Predict(mlContext);
+            if (command == Command.Predict)
+            {
+                Predict(mlContext);
+                ConsoleHelper.ConsoleWriteHeader(""=============== If you also want to train a model use Command.TrainAndPredict  ==============="");
+            }
 
-            ConsoleHelper.ConsoleWriteHeader(""=============== End of process, hit any key to finish ==============="");
+            if (command == Command.TrainAndPredict)
+            {
+                TrainEvaluateAndSaveModel(mlContext);
+                Predict(mlContext);
+            }
+
+            Console.WriteLine(""=============== End of process, hit any key to finish ==============="");
             Console.ReadKey();
+        }
 
+        private enum Command
+        {
+            Predict,
+            TrainAndPredict
         }
 
         private static ITransformer TrainEvaluateAndSaveModel(MLContext mlContext)
@@ -184,7 +197,7 @@ private static ITransformer TrainEvaluateAndSaveModel(MLContext mlContext)
                 mlContext.Model.Save(trainedModel, fs);
 
             Console.WriteLine(""The model is saved to {0}"", ModelPath);
-            ConsoleHelper.ConsoleWriteHeader(""=============== End of training process ==============="");
+            Console.WriteLine(""=============== End of training process ==============="");
 
             return trainedModel;
         }

diff --git a/src/mlnet/Templates/Console/MLCodeGen.tt b/src/mlnet/Templates/Console/MLCodeGen.tt
@@ -34,15 +34,28 @@ namespace <#= Namespace #>
             // Create MLContext to be shared across the model creation workflow objects 
             var mlContext = new MLContext();
 
-            // (Optional step) Create, Train, Evaluate and Save the model.zip file
-            TrainEvaluateAndSaveModel(mlContext);
+            var command = Command.Predict; // Your desired action here
 
-            // Make a single test prediction loading the model from model.zip file
-            Predict(mlContext);
+            if (command == Command.Predict)
+            {
+                Predict(mlContext);
+                ConsoleHelper.ConsoleWriteHeader("=============== If you also want to train a model use Command.TrainAndPredict  ===============");
+            }
 
-            ConsoleHelper.ConsoleWriteHeader("=============== End of process, hit any key to finish ===============");
+            if (command == Command.TrainAndPredict)
+            {
+                TrainEvaluateAndSaveModel(mlContext);
+                Predict(mlContext);
+            }
+
+            Console.WriteLine("=============== End of process, hit any key to finish ===============");
             Console.ReadKey();
+        }
 
+        private enum Command
+        {
+            Predict,
+            TrainAndPredict
         }
 
         private static ITransformer TrainEvaluateAndSaveModel(MLContext mlContext)
@@ -123,7 +136,7 @@ if(string.IsNullOrEmpty(TestPath)){ #>
                 mlContext.Model.Save(trainedModel, fs);
 
             Console.WriteLine("The model is saved to {0}", ModelPath);
-            ConsoleHelper.ConsoleWriteHeader("=============== End of training process ===============");
+            Console.WriteLine("=============== End of training process ===============");
 
             return trainedModel;
         }

diff --git a/src/mlnet/Templates/Console/MLProjectGen.cs b/src/mlnet/Templates/Console/MLProjectGen.cs
@@ -32,6 +32,12 @@ public virtual string TransformText()
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include=""Program.cs"" />
     <Compile Include=""ConsoleHelper.cs"" />

diff --git a/src/mlnet/Templates/Console/MLProjectGen.tt b/src/mlnet/Templates/Console/MLProjectGen.tt
@@ -10,6 +10,12 @@
     <TargetFramework>netcoreapp2.1</TargetFramework>
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
+  <PropertyGroup>
+    <RestoreSources>
+      https://api.nuget.org/v3/index.json;
+      https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
+    </RestoreSources>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="ConsoleHelper.cs" />