diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-04-20 19:45:10 +0200 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-04-20 19:45:10 +0200 |
| commit | 903a1884aae25e5ad35a32e00adc58a9ada41255 (patch) | |
| tree | b3efd0b9622e0eb85e2393daa95a91e5a218000f /Tools | |
| parent | a2a23b3f03fbed57803d98cf043ba0ac5592b12c (diff) | |
ScriptOutput.m: Use writeExpression instead of type-specific versions
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/CodeGen/ScriptOutput.m | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/Tools/CodeGen/ScriptOutput.m b/Tools/CodeGen/ScriptOutput.m index 6c0acec..3573ca1 100644 --- a/Tools/CodeGen/ScriptOutput.m +++ b/Tools/CodeGen/ScriptOutput.m @@ -62,28 +62,19 @@ DefFn[ DefFn[ writeCalculation[calc_List] := beginEndBlock["calculation", lookup[calc, Name], - Riffle[Map[writeEquation, lookup[calc, Equations]],"\n"], + Riffle[Map[writeExpression, lookup[calc, Equations]],"\n"], Indent -> True]]; -DefFn[writeEquation[lhs_ -> rhs_] := - {writeLHS[lhs], " = ", writeExpression[rhs]}]; +DefFn[writeExpression[lhs_ -> rhs_] := + {writeExpression[lhs], " = ", writeExpression[rhs]}]; -DefFn[writeLHS[lhs_Tensor] := - writeTensor[lhs]]; +DefFn[writeExpression[Tensor[T_, inds___]] := + {ToString[T], Map[writeExpression, {inds}]}]; -DefFn[writeLHS[lhs:dot[t_]] := - {"D_t ",writeLHS[t]}]; - -DefFn[writeLHS[lhs_Symbol] := - ToString[lhs]]; - -DefFn[writeTensor[Tensor[T_, inds___]] := - {ToString[T], Map[writeIndex, {inds}]}]; - -DefFn[writeIndex[TensorIndex[sym_, "l"]] := +DefFn[writeExpression[TensorIndex[sym_, "l"]] := {"_", ToString[sym]}]; -DefFn[writeIndex[TensorIndex[sym_, "u"]] := +DefFn[writeExpression[TensorIndex[sym_, "u"]] := {"^", ToString[sym]}]; writeExpression[lhs_] := @@ -108,7 +99,7 @@ writeExpression[IfThen[a_,b_,c_]] := {"(",paren@writeExpression[a], " ? ", paren@writeExpression[b], " : ", paren@writeExpression[c],")"}; writeExpression[KroneckerDelta[i1_TensorIndex,i2_TensorIndex]] := - {"delta", Map[writeIndex, {i1,i2}]}; + {"delta", Map[writeExpression, {i1,i2}]}; paren[x_] := {"(",x,")"}; @@ -140,10 +131,10 @@ writeExpression[dot[a_]] := {"D_t ",paren@writeExpression[a]}; writeExpression[d_?(MemberQ[$DerivativeNames,#]&)[var_,inds___]] := - {"D",Map[writeIndex,{inds}]," ",paren@writeExpression[var]}; + {"D",Map[writeExpression,{inds}]," ",paren@writeExpression[var]}; writeExpression[MatrixInverse[Tensor[t_,i_,j_]]] := - {"inverse(",ToString@t,")",Map[writeIndex,{i,j}]}; + {"inverse(",ToString@t,")",Map[writeExpression,{i,j}]}; (* Remaining tasks: |