From 5400ae7ce54fcb291ec96f8bcdafbd1c42ef9914 Mon Sep 17 00:00:00 2001 From: "julian.treiber" Date: Sun, 2 Feb 2020 11:54:21 +0100 Subject: [PATCH] added dice_weight parameter entry --- src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 | 2 +- .../monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java | 2 +- src/test/resources/valid_tests/FullConfig3.cnnt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 index 7b10f68..7db3d4c 100644 --- a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 +++ b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 @@ -115,7 +115,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number IgnoreIndicesEntry implements SoftmaxCrossEntropyIgnoreIndicesEntry = name:"ignore_indices" ":" value:IntegerValue; MarginEntry implements HingeEntry, SquaredHingeEntry = name:"margin" ":" value:NumberValue; LabelFormatEntry implements LogisticEntry = name:"label_format" ":" value:StringValue; - //DiceWeight implements DiceEntry = name: "dice_weight" ":" value:DoubleVectorValue; + DiceWeightEntry implements DiceEntry = name: "dice_weight" ":" value:DoubleVectorValue; interface OptimizerValue extends ConfigValue; interface SGDEntry extends OptimizerParamEntry; diff --git a/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java b/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java index 1bf0043..a512020 100644 --- a/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java +++ b/src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java @@ -51,7 +51,7 @@ class ParameterAlgorithmMapping { ASTBatchAxisEntry.class, ASTFromLogitsEntry.class, ASTIgnoreIndicesEntry.class, - //ASTDiceWeightEntry.class, + ASTDiceWeightEntry.class, ASTMarginEntry.class, ASTLabelFormatEntry.class, ASTRhoEntry.class, diff --git a/src/test/resources/valid_tests/FullConfig3.cnnt b/src/test/resources/valid_tests/FullConfig3.cnnt index ad33493..9270cd3 100644 --- a/src/test/resources/valid_tests/FullConfig3.cnnt +++ b/src/test/resources/valid_tests/FullConfig3.cnnt @@ -9,6 +9,7 @@ configuration FullConfig{ from_logits: true loss_axis : -1 batch_axis: 0 + dice_weight: (0.2, 0.8) } context : gpu normalize : true -- GitLab