refactor: use nameof and normal enum order

This commit is contained in:
Anna 2021-04-02 15:11:39 -04:00
parent 0c76f4aee2
commit b403b4db93
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.Text.ProduceNgrams("MsgNgrams", "MsgKey", weighting: NgramExtractingEstimator.WeightingCriteria.Tf))
.Append(ctx.Transforms.NormalizeLpNorm("FeaturisedMessage", "MsgNgrams"))
.Append(ctx.Transforms.Conversion.ConvertType("CPartyFinder", "PartyFinder"))
.Append(ctx.Transforms.Conversion.ConvertType("CShout", "Shout"))
.Append(ctx.Transforms.Conversion.ConvertType("CTrade", "ContainsTradeWords"))
.Append(ctx.Transforms.Conversion.ConvertType("CSketch", "ContainsSketchUrl"))
.Append(ctx.Transforms.Conversion.ConvertType("HasWard", "ContainsWard"))
.Append(ctx.Transforms.Conversion.ConvertType("HasPlot", "ContainsPlot"))
.Append(ctx.Transforms.Conversion.ConvertType("HasNumbers", "ContainsHousingNumbers"))
.Append(ctx.Transforms.Conversion.ConvertType("CPartyFinder", nameof(Data.Computed.PartyFinder)))
.Append(ctx.Transforms.Conversion.ConvertType("CShout", nameof(Data.Computed.Shout)))
.Append(ctx.Transforms.Conversion.ConvertType("CTrade", nameof(Data.Computed.ContainsTradeWords)))
.Append(ctx.Transforms.Conversion.ConvertType("CSketch", nameof(Data.Computed.ContainsSketchUrl)))
.Append(ctx.Transforms.Conversion.ConvertType("HasWard", nameof(Data.Computed.ContainsWard)))
.Append(ctx.Transforms.Conversion.ConvertType("HasPlot", nameof(Data.Computed.ContainsPlot)))
.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.MulticlassClassification.Trainers.SdcaMaximumEntropy(exampleWeightColumnName: "Weight"))
.Append(ctx.Transforms.Conversion.MapKeyToValue("PredictedLabel"));

View File

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