From 1422c428e350d6ff4267ca1f9e49950e96c40ea9 Mon Sep 17 00:00:00 2001 From: Julian Dierkes Date: Thu, 2 Jan 2020 23:43:19 +0100 Subject: [PATCH] removed ImgResize Parameter because we have Preprocessing now --- .../de/monticore/lang/monticar/CNNTrain.mc4 | 2 -- .../cnntrain/_cocos/ParameterAlgorithmMapping.java | 3 +-- .../_symboltable/CNNTrainSymbolTableCreator.java | 14 -------------- .../cnntrain/helper/ConfigEntryNameConstants.java | 3 --- 4 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 index 4f1d7cb..ddfe3b3 100644 --- a/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 +++ b/src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4 @@ -259,8 +259,6 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number QNetworkEntry implements ConfigEntry = name:"qnet_name" ":" value:ComponentNameValue; PreprocessingEntry implements ConfigEntry = name:"preprocessing_name" ":" value:ComponentNameValue; - ImgResizeEntry implements ConfigEntry = name:"img_resize" ":" value:IntegerTupelValue; - // Noise Distribution Creator NoiseDistributionEntry implements MultiParamConfigEntry = name:"noise_distribution" ":" value:NoiseDistributionValue; interface NoiseDistributionValue extends MultiParamValue; 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 0bd4232..c02fab0 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 @@ -121,8 +121,7 @@ class ParameterAlgorithmMapping { private static final List GENERAL_GAN_PARAMETERS = Lists.newArrayList( ASTDiscriminatorNetworkEntry.class, ASTQNetworkEntry.class, - ASTNoiseDistributionEntry.class, - ASTImgResizeEntry.class + ASTNoiseDistributionEntry.class ); ParameterAlgorithmMapping() { diff --git a/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java b/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java index 1e65020..fb11d48 100644 --- a/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java +++ b/src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java @@ -512,20 +512,6 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP { configuration.getEntryMap().put(node.getName(), entry); } - @Override - public void visit(ASTImgResizeEntry node) { - EntrySymbol width_entry = new EntrySymbol(node.getName()); - EntrySymbol height_entry = new EntrySymbol(node.getName()); - - width_entry.setValue(getValueSymbolForInteger(node.getValue().getFirst())); - height_entry.setValue(getValueSymbolForInteger(node.getValue().getSecond())); - addToScopeAndLinkWithNode(width_entry, node); - addToScopeAndLinkWithNode(height_entry, node); - - configuration.getEntryMap().put(node.getName() + "_width", width_entry); - configuration.getEntryMap().put(node.getName() + "_height", height_entry); - } - @Override public void visit(ASTReplayMemoryEntry node) { processMultiParamConfigVisit(node, node.getValue().getName()); diff --git a/src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java b/src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java index 15eae86..e90a7da 100644 --- a/src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java +++ b/src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java @@ -50,7 +50,4 @@ public class ConfigEntryNameConstants { public static final String QNETWORK_NAME = "qnet_name"; public static final String PREPROCESSING_NAME = "preprocessing_name"; public static final String NOISE_DISTRIBUTION = "noise_distribution"; - public static final String IMG_RESIZE = "img_resize"; - public static final String IMG_RESIZE_WIDTH = "img_resize_width"; - public static final String IMG_RESIZE_HEIGHT = "img_resize_height"; } -- GitLab