Skip to content

Commit

Permalink
Merge pull request #137 from wiki-ai/fix_quote
Browse files Browse the repository at this point in the history 
Fix quote problem in Makefile generation
  • Loading branch information
@halfak
halfak committed Mar 1, 2018
2 parents d037594 + 589a595 commit d738c22
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 41 deletions.
82 changes: 41 additions & 41 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ models/arwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).1 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.035186595582635184" \
Expand Down Expand Up @@ -294,7 +294,7 @@ models/bnwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.021554310862" \
Expand Down Expand Up @@ -397,7 +397,7 @@ models/cawiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.01919" \
Expand Down Expand Up @@ -459,7 +459,7 @@ models/dewiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.049775581219426095" \
Expand Down Expand Up @@ -526,7 +526,7 @@ models/elwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.05170687756532186" \
Expand Down Expand Up @@ -584,7 +584,7 @@ models/enwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.034163555464634586" \
Expand Down Expand Up @@ -616,7 +616,7 @@ models/enwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9671661637600368" \
Expand Down Expand Up @@ -690,7 +690,7 @@ models/eswiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.11036013315847877" \
Expand Down Expand Up @@ -722,7 +722,7 @@ models/eswiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.11036013315847877" \
Expand Down Expand Up @@ -796,7 +796,7 @@ models/eswikibooks.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.1126671580499105" \
Expand Down Expand Up @@ -828,7 +828,7 @@ models/eswikibooks.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.5' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9139393939393939" \
Expand Down Expand Up @@ -897,7 +897,7 @@ models/eswikiquote.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.089509548245983" \
Expand Down Expand Up @@ -969,7 +969,7 @@ models/etwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.026158257457618593" \
Expand Down Expand Up @@ -1001,7 +1001,7 @@ models/etwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9841038281603702" \
Expand Down Expand Up @@ -1108,7 +1108,7 @@ models/fawiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.0297029702970297" \
Expand Down Expand Up @@ -1142,7 +1142,7 @@ models/fawiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9834641681438339" \
Expand Down Expand Up @@ -1240,7 +1240,7 @@ models/frwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.028751753155680224" \
Expand Down Expand Up @@ -1272,7 +1272,7 @@ models/frwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9786115007012622" \
Expand Down Expand Up @@ -1341,7 +1341,7 @@ models/hrwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.07927353670258512" \
Expand Down Expand Up @@ -1412,7 +1412,7 @@ models/huwiki.reverted.rf.model: \
editquality.feature_lists.huwiki.reverted \
reverted_for_damage \
--version=$(reverted_major_minor).1 \
-p 'criterion=entropy' \
-p 'criterion="entropy"' \
-p 'min_samples_leaf=13' \
-p 'n_estimators=320' \
--label-weight "true=$(reverted_weight)" \
Expand Down Expand Up @@ -1475,7 +1475,7 @@ models/idwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.02272613605673532" \
Expand Down Expand Up @@ -1542,7 +1542,7 @@ models/iswiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.08115405770288514" \
Expand Down Expand Up @@ -1604,7 +1604,7 @@ models/itwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.04628882613957241" \
Expand Down Expand Up @@ -1667,7 +1667,7 @@ models/jawiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.03256945140908635" \
Expand Down Expand Up @@ -1730,7 +1730,7 @@ models/kowiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.04717122705217348" \
Expand Down Expand Up @@ -1824,7 +1824,7 @@ models/nlwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.05068086413432989" \
Expand Down Expand Up @@ -1856,7 +1856,7 @@ models/nlwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9646257806900789" \
Expand Down Expand Up @@ -1931,7 +1931,7 @@ models/nowiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).1 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.019061539539679838" \
Expand Down Expand Up @@ -1989,7 +1989,7 @@ models/ptwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.06896029864299047" \
Expand Down Expand Up @@ -2021,7 +2021,7 @@ models/ptwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9397669373959542" \
Expand Down Expand Up @@ -2095,7 +2095,7 @@ models/rowiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).1 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.04956982793117247" \
Expand Down Expand Up @@ -2127,7 +2127,7 @@ models/rowiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).1 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9699379751900761" \
Expand Down Expand Up @@ -2201,7 +2201,7 @@ models/ruwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=5' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.053479185657854755" \
Expand Down Expand Up @@ -2233,7 +2233,7 @@ models/ruwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.1' \
-p 'max_depth=3' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=300' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9713866099463182" \
Expand Down Expand Up @@ -2308,7 +2308,7 @@ models/sqwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.0287028702870287" \
Expand Down Expand Up @@ -2340,7 +2340,7 @@ models/sqwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9763476347634763" \
Expand Down Expand Up @@ -2430,7 +2430,7 @@ models/tawiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=500' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.015904172328753335" \
Expand Down Expand Up @@ -2502,7 +2502,7 @@ models/trwiki.damaging.gradient_boosting.model: \
--version=$(damaging_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(damaging_weight)" \
--pop-rate "true=0.0495014425266994" \
Expand Down Expand Up @@ -2534,7 +2534,7 @@ models/trwiki.goodfaith.gradient_boosting.model: \
--version=$(goodfaith_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "false=$(goodfaith_weight)" \
--pop-rate "true=0.9538897605911829" \
Expand Down Expand Up @@ -2598,7 +2598,7 @@ models/ukwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.021877665713282153" \
Expand Down Expand Up @@ -2699,7 +2699,7 @@ models/viwiki.reverted.gradient_boosting.model: \
--version=$(reverted_major_minor).0 \
-p 'learning_rate=0.01' \
-p 'max_depth=7' \
-p 'max_features=log2' \
-p 'max_features="log2"' \
-p 'n_estimators=700' \
--label-weight "true=$(reverted_weight)" \
--pop-rate "true=0.019211042993949594" \
Expand Down
4 changes: 4 additions & 0 deletions editquality/codegen/config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ def load_wiki(wiki, config):
model_defaults = copy.deepcopy(config["model_defaults"])
if not model.get('rf'):
model = util.deep_update(model_defaults, model)
for case in model['tuning_params']:
value = model['tuning_params'][case]
if isinstance(value, str):
model['tuning_params'][case] = '"%s"' % value
result[model_name] = model

wiki["models"] = result
Expand Down

0 comments on commit d738c22

Please sign in to comment.