Skip to content

Commit bbf2eab

Browse files
committed
Refactoring related to namespaces and public input/output classes. (dotnet#3222)
1 parent d5128a1 commit bbf2eab

14 files changed

+51
-48
lines changed

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ApplyCustomWordEmbedding.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
33
using System.IO;
4-
using System.Text;
4+
using Microsoft.ML;
55

6-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
77
{
88
public static class ApplyCustomWordEmbedding
99
{
@@ -67,12 +67,12 @@ public static void Example()
6767
// Features: -1.0000 0.0000 -100.0000 0.0000 34.0000 -25.6667 1.0000 100.0000 20.0000
6868
}
6969

70-
public class TextData
70+
private class TextData
7171
{
7272
public string Text { get; set; }
7373
}
7474

75-
public class TransformedTextData : TextData
75+
private class TransformedTextData : TextData
7676
{
7777
public float[] Features { get; set; }
7878
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ApplyWordEmbedding.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
4+
using Microsoft.ML.Transforms.Text;
45

5-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
67
{
78
public static class ApplyWordEmbedding
89
{
@@ -29,8 +30,8 @@ public static void Example()
2930
// The pipeline first normalizes and tokenizes text then applies word embedding transformation.
3031
var textPipeline = mlContext.Transforms.Text.NormalizeText("Text")
3132
.Append(mlContext.Transforms.Text.TokenizeIntoWords("Tokens", "Text"))
32-
.Append(mlContext.Transforms.Text.ApplyWordEmbedding("Features", "Tokens",
33-
Transforms.Text.WordEmbeddingEstimator.PretrainedModelKind.SentimentSpecificWordEmbedding));
33+
.Append(mlContext.Transforms.Text.ApplyWordEmbedding("Features", "Tokens",
34+
WordEmbeddingEstimator.PretrainedModelKind.SentimentSpecificWordEmbedding));
3435

3536
// Fit to data.
3637
var textTransformer = textPipeline.Fit(emptyDataView);
@@ -55,12 +56,12 @@ public static void Example()
5556
// Features: -1.2489 0.2384 -1.3034 -0.9135 -3.4978 -0.1784 -1.3823 -0.3863 -2.5262 -0.8950 ...
5657
}
5758

58-
public class TextData
59+
private class TextData
5960
{
6061
public string Text { get; set; }
6162
}
6263

63-
public class TransformedTextData : TextData
64+
private class TransformedTextData : TextData
6465
{
6566
public float[] Features { get; set; }
6667
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/FeaturizeText.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using Microsoft.ML.Data;
3+
using Microsoft.ML;
44

5-
namespace Microsoft.ML.Samples.Dynamic
5+
namespace Samples.Dynamic
66
{
77
public static class FeaturizeText
88
{
@@ -60,12 +60,12 @@ public static void Example()
6060
// Features: 0.0857 0.0857 0.0857 0.0857 0.0857 0.0857 0.0857 0.0857 0.0857 0.1715 ...
6161
}
6262

63-
public class TextData
63+
private class TextData
6464
{
6565
public string Text { get; set; }
6666
}
6767

68-
public class TransformedTextData : TextData
68+
private class TransformedTextData : TextData
6969
{
7070
public float[] Features { get; set; }
7171
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/FeaturizeTextWithOptions.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using Microsoft.ML.Data;
3+
using Microsoft.ML;
44
using Microsoft.ML.Transforms.Text;
55

6-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
77
{
88
public static class FeaturizeTextWithOptions
99
{
@@ -67,12 +67,12 @@ public static void Example()
6767
// Tokens: ml.net's,featurizetext,api,uses,composition,basic,transforms,convert,text,numeric,features.
6868
}
6969

70-
public class TextData
70+
private class TextData
7171
{
7272
public string Text { get; set; }
7373
}
7474

75-
public class TransformedTextData : TextData
75+
private class TransformedTextData : TextData
7676
{
7777
public float[] Features { get; set; }
7878
public string[] OutputTokens { get; set; }

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/LatentDirichletAllocation.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using Microsoft.ML.Data;
3+
using Microsoft.ML;
44

5-
namespace Microsoft.ML.Samples.Dynamic
5+
namespace Samples.Dynamic
66
{
77
public static class LatentDirichletAllocation
88
{

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/NormalizeText.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
4+
using Microsoft.ML.Transforms.Text;
45

5-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
67
{
78
public static class NormalizeText
89
{
@@ -22,7 +23,7 @@ public static void Example()
2223

2324
// A pipeline for normalizing text.
2425
var normTextPipeline = mlContext.Transforms.Text.NormalizeText("NormalizedText", "Text",
25-
Transforms.Text.TextNormalizingEstimator.CaseMode.Lower,
26+
TextNormalizingEstimator.CaseMode.Lower,
2627
keepDiacritics: false,
2728
keepPunctuations: false,
2829
keepNumbers: false);
@@ -44,12 +45,12 @@ public static void Example()
4445
// Normalized Text: mlnets normalizetext api changes the case of the text and removeskeeps diacritics punctuations andor numbers
4546
}
4647

47-
public class TextData
48+
private class TextData
4849
{
4950
public string Text { get; set; }
5051
}
5152

52-
public class TransformedTextData : TextData
53+
private class TransformedTextData : TextData
5354
{
5455
public string NormalizedText { get; set; }
5556
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ProduceHashedNgrams.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3+
using Microsoft.ML;
34
using Microsoft.ML.Data;
4-
using Microsoft.ML.Transforms.Text;
55

6-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
77
{
88
public static class ProduceHashedNgrams
99
{

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ProduceHashedWordBags.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
44
using Microsoft.ML.Data;
5-
using Microsoft.ML.Transforms.Text;
65

7-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
87
{
98
public static class ProduceHashedWordBags
109
{

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ProduceNgrams.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
using System;
22
using System.Collections.Generic;
3+
using Microsoft.ML;
34
using Microsoft.ML.Data;
45
using Microsoft.ML.Transforms.Text;
56

6-
namespace Microsoft.ML.Samples.Dynamic
7+
namespace Samples.Dynamic
78
{
89
public static class ProduceNgrams
910
{

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/ProduceWordBags.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
44
using Microsoft.ML.Data;
55
using Microsoft.ML.Transforms.Text;
66

7-
namespace Microsoft.ML.Samples.Dynamic
7+
namespace Samples.Dynamic
88
{
99
public static class ProduceWordBags
1010
{

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/RemoveDefaultStopWords.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
using System;
22
using System.Collections.Generic;
3+
using Microsoft.ML;
34
using Microsoft.ML.Transforms.Text;
45

5-
namespace Microsoft.ML.Samples.Dynamic
6+
namespace Samples.Dynamic
67
{
78
public static class RemoveDefaultStopWords
89
{
@@ -47,12 +48,12 @@ public static void Example()
4748
// Words without stop words: ML.NET's,RemoveDefaultStopWords,API,removes,stop,words,text/string.,requires,text/string,tokenized,beforehand.
4849
}
4950

50-
public class TextData
51+
private class TextData
5152
{
5253
public string Text { get; set; }
5354
}
5455

55-
public class TransformedTextData : TextData
56+
private class TransformedTextData : TextData
5657
{
5758
public string[] WordsWithoutStopWords { get; set; }
5859
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/RemoveStopWords.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using Microsoft.ML.Transforms.Text;
3+
using Microsoft.ML;
44

5-
namespace Microsoft.ML.Samples.Dynamic
5+
namespace Samples.Dynamic
66
{
77
public static class RemoveStopWords
88
{
@@ -47,12 +47,12 @@ public static void Example()
4747
// Words without stop words: ML.NET's,RemoveStopWords,API,removes,stop,words,text/string,using,list,of,stop,words,provided,user.
4848
}
4949

50-
public class TextData
50+
private class TextData
5151
{
5252
public string Text { get; set; }
5353
}
5454

55-
public class TransformedTextData : TextData
55+
private class TransformedTextData : TextData
5656
{
5757
public string[] WordsWithoutStopWords { get; set; }
5858
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/TokenizeIntoCharactersAsKeys.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
44

5-
namespace Microsoft.ML.Samples.Dynamic
5+
namespace Samples.Dynamic
66
{
77
public static class TokenizeIntoCharactersAsKeys
88
{
@@ -50,12 +50,12 @@ public static void Example()
5050
// <?>: is a unicode control character used instead of spaces ('\u2400').
5151
}
5252

53-
public class TextData
53+
private class TextData
5454
{
5555
public string Text { get; set; }
5656
}
5757

58-
public class TransformedTextData : TextData
58+
private class TransformedTextData : TextData
5959
{
6060
public string[] CharTokens { get; set; }
6161
}

docs/samples/Microsoft.ML.Samples/Dynamic/Transforms/Text/TokenizeIntoWords.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Text;
3+
using Microsoft.ML;
44

5-
namespace Microsoft.ML.Samples.Dynamic
5+
namespace Samples.Dynamic
66
{
77
public static class TokenizeIntoWords
88
{
@@ -46,12 +46,12 @@ public static void Example()
4646
// Words: ML.NET's,TokenizeIntoWords,API,splits,text/string,into,words,using,the,list,of,characters,provided,as,separators.
4747
}
4848

49-
public class TextData
49+
private class TextData
5050
{
5151
public string Text { get; set; }
5252
}
5353

54-
public class TransformedTextData : TextData
54+
private class TransformedTextData : TextData
5555
{
5656
public string[] Words { get; set; }
5757
}

0 commit comments

Comments
 (0)