refactor: use nameof and normal enum order

This commit is contained in:
Anna 2021-04-02 15:11:39 -04:00
parent 9ab3e51855
commit ce98e27056
Signed by: anna
GPG Key ID: 0B391D8F06FCD9E0
2 changed files with 17 additions and 17 deletions

View File

@ -130,13 +130,13 @@ namespace NoSoliciting.Trainer {
.Append(ctx.Transforms.Conversion.MapValueToKey("MsgKey", "MsgNoStop")) .Append(ctx.Transforms.Conversion.MapValueToKey("MsgKey", "MsgNoStop"))
.Append(ctx.Transforms.Text.ProduceNgrams("MsgNgrams", "MsgKey", weighting: NgramExtractingEstimator.WeightingCriteria.Tf)) .Append(ctx.Transforms.Text.ProduceNgrams("MsgNgrams", "MsgKey", weighting: NgramExtractingEstimator.WeightingCriteria.Tf))
.Append(ctx.Transforms.NormalizeLpNorm("FeaturisedMessage", "MsgNgrams")) .Append(ctx.Transforms.NormalizeLpNorm("FeaturisedMessage", "MsgNgrams"))
.Append(ctx.Transforms.Conversion.ConvertType("CPartyFinder", "PartyFinder")) .Append(ctx.Transforms.Conversion.ConvertType("CPartyFinder", nameof(Data.Computed.PartyFinder)))
.Append(ctx.Transforms.Conversion.ConvertType("CShout", "Shout")) .Append(ctx.Transforms.Conversion.ConvertType("CShout", nameof(Data.Computed.Shout)))
.Append(ctx.Transforms.Conversion.ConvertType("CTrade", "ContainsTradeWords")) .Append(ctx.Transforms.Conversion.ConvertType("CTrade", nameof(Data.Computed.ContainsTradeWords)))
.Append(ctx.Transforms.Conversion.ConvertType("CSketch", "ContainsSketchUrl")) .Append(ctx.Transforms.Conversion.ConvertType("CSketch", nameof(Data.Computed.ContainsSketchUrl)))
.Append(ctx.Transforms.Conversion.ConvertType("HasWard", "ContainsWard")) .Append(ctx.Transforms.Conversion.ConvertType("HasWard", nameof(Data.Computed.ContainsWard)))
.Append(ctx.Transforms.Conversion.ConvertType("HasPlot", "ContainsPlot")) .Append(ctx.Transforms.Conversion.ConvertType("HasPlot", nameof(Data.Computed.ContainsPlot)))
.Append(ctx.Transforms.Conversion.ConvertType("HasNumbers", "ContainsHousingNumbers")) .Append(ctx.Transforms.Conversion.ConvertType("HasNumbers", nameof(Data.Computed.ContainsHousingNumbers)))
.Append(ctx.Transforms.Concatenate("Features", "FeaturisedMessage", "CPartyFinder", "CShout", "CTrade", "HasWard", "HasPlot", "HasNumbers", "CSketch")) .Append(ctx.Transforms.Concatenate("Features", "FeaturisedMessage", "CPartyFinder", "CShout", "CTrade", "HasWard", "HasPlot", "HasNumbers", "CSketch"))
.Append(ctx.MulticlassClassification.Trainers.SdcaMaximumEntropy(exampleWeightColumnName: "Weight")) .Append(ctx.MulticlassClassification.Trainers.SdcaMaximumEntropy(exampleWeightColumnName: "Weight"))
.Append(ctx.Transforms.Conversion.MapKeyToValue("PredictedLabel")); .Append(ctx.Transforms.Conversion.MapKeyToValue("PredictedLabel"));

View File

@ -2,16 +2,16 @@
namespace NoSoliciting.Ml { namespace NoSoliciting.Ml {
public enum MessageCategory { public enum MessageCategory {
Trade = 0, Trade,
FreeCompany = 1, FreeCompany,
Normal = 2, Normal,
Phishing = 3, Phishing,
RmtContent = 4, RmtContent,
RmtGil = 5, RmtGil,
Roleplaying = 6, Roleplaying,
Static = 7, Static,
StaticSub = 9, Community,
Community = 8, StaticSub,
} }
public static class MessageCategoryExt { public static class MessageCategoryExt {