Author: chatellier Date: 2009-05-07 15:39:34 +0000 (Thu, 07 May 2009) New Revision: 2195 Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl Log: For matrix CD, take factor value (not domain default value :() Modified: isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl =================================================================== --- isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-05-07 12:47:26 UTC (rev 2194) +++ isis-fish/trunk/src/main/resources/templates/prescript/factorprescript.ftl 2009-05-07 15:39:34 UTC (rev 2195) @@ -42,11 +42,7 @@ <#if factor.domain.class.simpleName.equals("EquationContinuousDomain")> context.setValue("${factor.name}.${factor.domain.variableName}", ${factor.value}, "${factor.domain.operator}"); <#else> - <#if factor.domain.class.simpleName.equals("MatrixContinuousDomain")> - <#assign value=factor.domain.matrix /> - <#else> - <#assign value=factor.value /> - </#if> + <#assign value=factor.value /> <#assign serializedValue=beanUtils.convert(value)/> <#assign path=factor.path /> <#assign topiaId=path?substring(0, path?last_index_of("#"))/>