Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
C
CNNTrainLang
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Test Cases
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
monticore
EmbeddedMontiArc
languages
CNNTrainLang
Commits
7574b6e6
Commit
7574b6e6
authored
Jan 09, 2020
by
Julian Dierkes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extended CNNTrain with constraint losses
parent
8531caff
Pipeline
#226086
passed with stages
in 9 minutes
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
10 deletions
+27
-10
src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
+7
-2
src/main/java/de/monticore/lang/monticar/cnntrain/_ast/ASTMultiParamValueMapTupleValue.java
...nticar/cnntrain/_ast/ASTMultiParamValueMapTupleValue.java
+1
-1
src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
...g/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
+2
-1
src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java
...car/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java
+16
-6
src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java
...ng/monticar/cnntrain/helper/ConfigEntryNameConstants.java
+1
-0
No files found.
src/main/grammars/de/monticore/lang/monticar/CNNTrain.mc4
View file @
7574b6e6
...
...
@@ -69,7 +69,7 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
interface
OptimizerParamEntry
extends
Entry
;
interface
LossValue
extends
Config
Value
;
interface
LossValue
extends
MultiParam
Value
;
L1Loss
implements
LossValue
=
name
:
"l1"
(
"{"
params
:
Entry
*
"}"
)?;
...
...
@@ -281,5 +281,10 @@ grammar CNNTrain extends de.monticore.lang.monticar.Common2, de.monticore.Number
//
Constraint
Distributions
ConstraintDistributionEntry
implements
MultiParamValueMapConfigEntry
=
name
:
"constraint_distributions"
":"
value
:
ConstraintDistributionValue
;
ConstraintDistributionValue
implements
MultiParamValueMapParamValue
=
(
"{"
params
:
ConstraintDistributionParam
*
"}"
)?;
ConstraintDistributionParam
implements
MultiParamValueMapTupleValue
=
name
:
StringValue
":"
distribution
:
NoiseDistributionValue
;
ConstraintDistributionParam
implements
MultiParamValueMapTupleValue
=
name
:
StringValue
":"
multiParamValue
:
NoiseDistributionValue
;
//
Constraint
losses
ConstraintLossEntry
implements
MultiParamValueMapConfigEntry
=
name
:
"constraint_losses"
":"
value
:
ConstraintLossValue
;
ConstraintLossValue
implements
MultiParamValueMapParamValue
=
(
"{"
params
:
ConstraintLossParam
*
"}"
)?;
ConstraintLossParam
implements
MultiParamValueMapTupleValue
=
name
:
StringValue
":"
multiParamValue
:
LossValue
;
}
\ No newline at end of file
src/main/java/de/monticore/lang/monticar/cnntrain/_ast/ASTMultiParamValueMapTupleValue.java
View file @
7574b6e6
...
...
@@ -16,7 +16,7 @@ import java.util.Map;
*
*/
public
interface
ASTMultiParamValueMapTupleValue
extends
ASTMultiParamValueMapTupleValueTOP
{
default
AST
NoiseDistributionValue
getDistribution
()
{
default
AST
MultiParamValue
getMultiParamValue
()
{
return
null
;
}
default
ASTStringValue
getName
()
{
...
...
src/main/java/de/monticore/lang/monticar/cnntrain/_cocos/ParameterAlgorithmMapping.java
View file @
7574b6e6
...
...
@@ -122,7 +122,8 @@ class ParameterAlgorithmMapping {
ASTDiscriminatorNetworkEntry
.
class
,
ASTQNetworkEntry
.
class
,
ASTNoiseDistributionEntry
.
class
,
ASTConstraintDistributionEntry
.
class
ASTConstraintDistributionEntry
.
class
,
ASTConstraintLossEntry
.
class
);
ParameterAlgorithmMapping
()
{
...
...
src/main/java/de/monticore/lang/monticar/cnntrain/_symboltable/CNNTrainSymbolTableCreator.java
View file @
7574b6e6
...
...
@@ -573,6 +573,16 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
processMultiParamMapConfigEndVisit
(
node
);
}
@Override
public
void
visit
(
ASTConstraintLossEntry
node
)
{
processMultiParamMapConfigVisit
(
node
,
node
.
getName
());
}
@Override
public
void
endVisit
(
ASTConstraintLossEntry
node
)
{
processMultiParamMapConfigEndVisit
(
node
);
}
@Override
public
void
visit
(
ASTNoiseDistributionEntry
node
)
{
NoiseDistribution
noiseDistribution
;
...
...
@@ -689,14 +699,14 @@ public class CNNTrainSymbolTableCreator extends CNNTrainSymbolTableCreatorTOP {
for
(
ASTConfigValue
nodeParam
:
((
ASTMultiParamValueMapParamValue
)
node
.
getValue
()).
getParamsList
())
{
ASTMultiParamValueMapTupleValue
tuple
=
((
ASTMultiParamValueMapTupleValue
)
nodeParam
);
ASTStringValue
name
=
tuple
.
getName
();
ASTMultiParamValue
distribution
=
tuple
.
getDistribution
();
String
distrName
=
distribution
.
getName
();
multiParamValueMapSymbol
.
addMultiParamValueName
(
getStringFromStringValue
(
name
),
distr
Name
);
ASTMultiParamValue
multiValue
=
tuple
.
getMultiParamValue
();
String
valueName
=
multiValue
.
getName
();
multiParamValueMapSymbol
.
addMultiParamValueName
(
getStringFromStringValue
(
name
),
value
Name
);
HashMap
<
String
,
Object
>
mapEntry
=
new
HashMap
<>();
for
(
ASTEntry
param
:
distribution
.
getParamsList
())
{
String
distr
EntryName
=
param
.
getName
();
for
(
ASTEntry
param
:
multiValue
.
getParamsList
())
{
String
value
EntryName
=
param
.
getName
();
Object
res
=
retrievePrimitiveValueByConfigValue
(
param
.
getValue
());
mapEntry
.
put
(
distr
EntryName
,
res
);
mapEntry
.
put
(
value
EntryName
,
res
);
}
multiParamValueMapSymbol
.
addParameter
(
getStringFromStringValue
(
name
),
mapEntry
);
}
...
...
src/main/java/de/monticore/lang/monticar/cnntrain/helper/ConfigEntryNameConstants.java
View file @
7574b6e6
...
...
@@ -51,4 +51,5 @@ public class ConfigEntryNameConstants {
public
static
final
String
PREPROCESSING_NAME
=
"preprocessing_name"
;
public
static
final
String
NOISE_DISTRIBUTION
=
"noise_distribution"
;
public
static
final
String
CONSTRAINT_DISTRIBUTION
=
"constraint_distributions"
;
public
static
final
String
CONSTRAINT_LOSS
=
"constraint_losses"
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment