Improvements to code generation for inferred chart colors. Simplified output, prevented non-gathered data from being generated.
diff --git a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/src/metaabm/ascape/tmpl/inferascape.ext b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/src/metaabm/ascape/tmpl/inferascape.ext
index 0113e65..cd75c53 100644
--- a/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/src/metaabm/ascape/tmpl/inferascape.ext
+++ b/org.eclipse.amp.amf/plugins/org.eclipse.amp.amf.gen.ascape/src/metaabm/ascape/tmpl/inferascape.ext
@@ -218,10 +218,10 @@
((SAgent) attr.owner).asAgent() + "." + attr.setterName() + "(" + val + ")";
List setterSpace(SState attr) :
- attr.options.collect(a | {a.label + " " + attr.label, attr.setTo(a.typeName())});
+ attr.gatherData ? attr.options.collect(a | {a.label + " " + attr.label, attr.setTo(a.typeName())}) : {};
List setterSpace(SAttribute attr) :
- attr.sType == SAttributeType::Boolean ? {{"is " + attr.label, attr.setTo("true")}, {"is not " + attr.label, attr.setTo("false")}} : {};
+ attr.gatherData && attr.sType == SAttributeType::Boolean ? {{"is " + attr.label, attr.setTo("true")}, {"is not " + attr.label, attr.setTo("false")}} : {};
List setterSpace(SStyle style) :
style.agent.attributes.setterSpace();
\ No newline at end of file