Merge pull request #778 from dotnet/master

JRAlexander · web-flow · commit d81698b73108 · 2019-04-02T13:12:10.000-05:00
Update live from current master
diff --git a/machine-learning/tutorials/TransferLearningTF/Program.cs b/machine-learning/tutorials/TransferLearningTF/Program.cs
@@ -39,7 +39,7 @@ static void Main(string[] args)
 
             // <SnippetCallReuseAndTuneInceptionModel>
             ReuseAndTuneInceptionModel(mlContext, _trainTagsTsv, _trainImagesFolder, _inceptionPb, _outputImageClassifierZip);
-            // </CallSnippetReuseAndTuneInceptionModel>
+            // </SnippetCallReuseAndTuneInceptionModel>
 
             // <SnippetCallClassifyImages>
             ClassifyImages(mlContext, _predictImageListTsv, _predictImagesFolder, _outputImageClassifierZip);
@@ -186,7 +186,7 @@ public static void ClassifySingleImage(MLContext mlContext, string imagePath, st
             {
                 ImagePath = imagePath
             }; 
-            // </SnippetReadFromTSV2>  
+            // </SnippetLoadImageData>  
 
             // <SnippetPredictSingle>  
             // Make prediction function (input = ImageNetData, output = ImageNetPrediction)
diff --git a/snippets/cpp/VS_Snippets_CLR/EventLogEntry_Source/CPP/eventlogentry_source.cpp b/snippets/cpp/VS_Snippets_CLR/EventLogEntry_Source/CPP/eventlogentry_source.cpp
@@ -48,7 +48,7 @@ int main()
    int myCount = myLogEntryCollection->Count;
    
    // Iterate through all 'EventLogEntry' instances in 'EventLog'.
-   for ( int i = myCount - 1; i > 0; i-- )
+   for ( int i = myCount - 1; i > -1; i-- )
    {
       EventLogEntry^ myLogEntry = myLogEntryCollection[ i ];
       
diff --git a/snippets/csharp/VS_Snippets_CLR/EventLogEntry_Source/CS/eventlogentry_source.cs b/snippets/csharp/VS_Snippets_CLR/EventLogEntry_Source/CS/eventlogentry_source.cs
@@ -38,7 +38,7 @@ public static void Main()
             EventLogEntryCollection myLogEntryCollection=myEventLog.Entries;
             int myCount =myLogEntryCollection.Count;
             // Iterate through all 'EventLogEntry' instances in 'EventLog'.
-            for(int i=myCount-1;i>0;i--)
+            for(int i=myCount-1;i>-1;i--)
             {
                EventLogEntry myLogEntry = myLogEntryCollection[i];
                // Select the entry having desired EventType.
@@ -55,4 +55,4 @@ public static void Main()
          }
    }
 // </Snippet2>
-// </Snippet1>
+// </Snippet1>

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ int main()`
`48`	`48`	`int myCount = myLogEntryCollection->Count;`
`49`	`49`
`50`	`50`	`// Iterate through all 'EventLogEntry' instances in 'EventLog'.`
`51`		`- for ( int i = myCount - 1; i > 0; i-- )`
	`51`	`+ for ( int i = myCount - 1; i > -1; i-- )`
`52`	`52`	`{`
`53`	`53`	`EventLogEntry^ myLogEntry = myLogEntryCollection[ i ];`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public static void Main()`
`38`	`38`	`EventLogEntryCollection myLogEntryCollection=myEventLog.Entries;`
`39`	`39`	`int myCount =myLogEntryCollection.Count;`
`40`	`40`	`// Iterate through all 'EventLogEntry' instances in 'EventLog'.`
`41`		`- for(int i=myCount-1;i>0;i--)`
	`41`	`+ for(int i=myCount-1;i>-1;i--)`
`42`	`42`	`{`
`43`	`43`	`EventLogEntry myLogEntry = myLogEntryCollection[i];`
`44`	`44`	`// Select the entry having desired EventType.`
`@@ -55,4 +55,4 @@ public static void Main()`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`// </Snippet2>`
`58`		`-// </Snippet1>`
	`58`	`+// </Snippet1>`