- Added time Point value and index in XML code generation

- Fixed XML code generation for Builtin functions git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@14153 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 29, 2012 · 1809490 · 1809490
1 parent 3e878e3
commit 1809490
Showing 1 changed file with 27 additions and 4 deletions.
diff --git a/Compiler/Template/CodegenXML.tpl b/Compiler/Template/CodegenXML.tpl
@@ -229,7 +229,7 @@ template variableCategoryXml(VarKind varKind)
   case DUMMY_STATE(__) then "algebraic" 
   case DISCRETE(__)    then "algebraic"
   case PARAM(__)       then "parameter" 
-  case CONST(__)       then "IndependentConstant"
+  case CONST(__)       then "independentConstant"
   else error(sourceInfo(), "Unexpected simVarTypeName varKind")
 end variableCategoryXml;
 
@@ -1411,13 +1411,25 @@ template classAttributesXml(ClassAttributes classAttribute, SimCode simCode)
           <opt:Value><%daeExpValueXml(exp, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/)%></opt:Value>
         </opt:IntervalFinalTime>
         >>
+      let timePointIndex = match startTimeE case SOME(exp) then
+      	<<
+      	<opt:Index><%daeExpValueXml(exp, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/)%></opt:Index>
+      	>>
+      let timePointValue = match finalTimeE case SOME(exp) then
+      	<<
+      	<opt:Value><%daeExpValueXml(exp, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/)%></opt:Value>
+      	>>
       let constraints = match simCode case SIMCODE(modelInfo = MODELINFO(__)) then constraintsXml(constraints)              
         <<
         <opt:Optimization>
           <%objectiveFunction%>
           <%objectiveIntegrand%>
           <%startTime%>
           <%finalTime%>
+          <opt:TimePoints>
+          	<%timePointIndex%>
+          	<%timePointValue%>
+          </opt:TimePoints>
           <opt:pathConstraints>
               <%constraints%>
           </opt:pathConstraints>          
@@ -3357,7 +3369,8 @@ template daeExpCallXml(Exp call, Context context, Text &preExp /*BUFP*/,
 
   case exp as CALL(attr=attr as CALL_ATTR(__)) then
     let argStr = (expLst |> exp => '<%daeExpXml(exp, context, &preExp /*BUFC*/, &varDecls /*BUFD*/)%>' ;separator="\n")
-    let builtinName ='<%dotPathXml(path)%>'
+    //let builtinName ='<%dotPathXml(path)%>'
+    let builtinFunctionName ='<%builtinFunctionNameXml(path)%>'
     let funName = '<%underscorePathXml(path)%>'
     let retType = if attr.builtin then (match attr.ty case T_NORETCALL(__) then ""
       else expTypeModelicaXml(attr.ty))
@@ -3372,9 +3385,9 @@ template daeExpCallXml(Exp call, Context context, Text &preExp /*BUFP*/,
       case CALL(attr=CALL_ATTR(tuple_=false)) then
         if attr.builtin then 
           <<
-          <exp:<%builtinName%>>
+          <exp:<%builtinFunctionName%>>
             <%argStr%>  
-          </exp:<%builtinName%>>
+          </exp:<%builtinFunctionName%>>
           >>
         else 
           <<
@@ -3401,6 +3414,16 @@ template daeExpCallXml(Exp call, Context context, Text &preExp /*BUFP*/,
         >>
 end daeExpCallXml;
 
+template builtinFunctionNameXml(Path path)
+::=
+  match path
+	case IDENT(name="DIVISION") then 'Div'
+	case IDENT(name="ADDITION") then 'Add'
+	case IDENT(name="SUBTRACTION") then 'Sub'
+	case IDENT(name="POWER") then 'Pow'
+	else "Builtin Function is not yet implemented "
+end builtinFunctionNameXml;
+
 template daeExpTailCallXml(list<DAE.Exp> es, list<String> vs, Context context, Text &preExp, Text &varDecls)
 ::=
   match es