- Implemented linspace in ModelicaBuiltin.mo

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@10025 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: sjoelund

Compiler/FrontEnd/Ceval.mo

@@ -1081,7 +1081,6 @@ algorithm
     case "identity" then cevalBuiltinIdentity;
     case "promote" then cevalBuiltinPromote;
     case "String" then cevalBuiltinString;
-    case "linspace" then cevalBuiltinLinspace;
     case "Integer" then cevalBuiltinIntegerEnumeration;
     case "rooted" then cevalBuiltinRooted; //
     case "cross" then cevalBuiltinCross;
@@ -2370,74 +2369,8 @@ algorithm
   end match;
 end cevalBuiltinStringFormat;
 
-protected function cevalBuiltinLinspace "
-  author: PA
-  Evaluates the linpace function"
-  input Env.Cache inCache;
-  input Env.Env inEnv;
-  input list<DAE.Exp> inExpExpLst;
-  input Boolean inBoolean;
-  input Option<Interactive.SymbolTable> st;
-  input Msg inMsg;
-  output Env.Cache outCache;
-  output Values.Value outValue;
-  output Option<Interactive.SymbolTable> outST;
-algorithm
-  (outCache,outValue,outST):=
-  match (inCache,inEnv,inExpExpLst,inBoolean,st,inMsg)
-      local
-        DAE.Exp x,y,n; Integer size;
-        Real rx,ry; list<Values.Value> valLst; Env.Cache cache; Boolean impl; Env.Env env; Msg msg;
-    case (cache,env,{x,y,n},impl,st,msg) equation
-      (cache,Values.INTEGER(size),_) = ceval(cache,env, n, impl, st,msg);
-      verifyLinspaceN(size,{x,y,n});
-      (cache,Values.REAL(rx),_) = ceval(cache,env, x, impl, st,msg);
-      (cache,Values.REAL(ry),_) = ceval(cache,env, y, impl, st,msg);
-      valLst = cevalBuiltinLinspace2(rx,ry,size,1);
-    then (cache,ValuesUtil.makeArray(valLst),st);
-
-  end match;
-end cevalBuiltinLinspace;
-
-protected function verifyLinspaceN "checks that n>=2 for linspace(x,y,n) "
-  input Integer n;
-  input list<DAE.Exp> expl;
-algorithm
-  _ := matchcontinue(n,expl)
-  local String s; DAE.Exp x,y,nx;
-    case(n,_) equation
-      true = n >= 2;
-    then ();
-    case(_,{x,y,nx})
-      equation
-        s = "linspace("+&ExpressionDump.printExpStr(x)+&", "+&ExpressionDump.printExpStr(y)+&", "+&ExpressionDump.printExpStr(nx)+&")";
-        Error.addMessage(Error.LINSPACE_ILLEGAL_SIZE_ARG,{s});
-      then fail();
-  end matchcontinue;
-end verifyLinspaceN;
-
-protected function cevalBuiltinLinspace2 "Helper function to cevalBuiltinLinspace"
-  input Real rx;
-  input Real ry;
-  input Integer size;
-  input Integer i "iterator 1 <= i <= size";
-  output list<Values.Value> valLst;
-algorithm
-  valLst := matchcontinue(rx,ry,size,i)
-  local Real r;
-    case(rx,ry,size,i) equation
-      true = i > size;
-    then {};
-    case(rx,ry,size,i) equation
-      r = rx +. (ry -. rx)*. intReal(i-1) /. intReal(size - 1);
-      valLst = cevalBuiltinLinspace2(rx,ry,size,i+1);
-    then Values.REAL(r)::valLst;
-  end matchcontinue;
-end cevalBuiltinLinspace2;
-
-protected function cevalBuiltinPrint "
-  author: sjoelund
-  Prints a String"
+protected function cevalBuiltinPrint
+  "Prints a String to stdout"
   input Env.Cache inCache;
   input Env.Env inEnv;
   input list<DAE.Exp> inExpExpLst;

Compiler/FrontEnd/ModelicaBuiltin.mo

@@ -215,6 +215,16 @@ function homotopy
 external "builtin";
 end homotopy;
 
+function linspace
+  input Real x1 "start";
+  input Real x2 "end";
+  input Integer n "number";
+  output Real v[n];
+algorithm
+  assert(n >= 2, "linspace requires n>=2 but got " + String(n));
+  v := {x1 + (x2-x1)*(i-1)/(n-1) for i in 1:n};
+end linspace;
+
 function div = overload(OpenModelica.Internal.intDiv,OpenModelica.Internal.realDiv);
 
 function mod = overload(OpenModelica.Internal.intMod,OpenModelica.Internal.realMod);
@@ -293,10 +303,6 @@ function fill
   external "builtin";
 end fill;
 
-function linspace
-  external "builtin";
-end linspace;
-
 function noEvent
   external "builtin";
 end noEvent;

Compiler/FrontEnd/Static.mo

@@ -5568,68 +5568,6 @@ algorithm
   end matchcontinue;
 end elabBuiltinString;
 
-protected function elabBuiltinLinspace "
-  author: PA
-
-  This function handles the built-in linspace function.
-  e.g. linspace(1,3,3) => {1,2,3}
-       linspace(0,1,5) => {0,0.25,0.5,0.75,1.0}
-"
-  input Env.Cache inCache;
-  input Env.Env inEnv;
-  input list<Absyn.Exp> expl;
-  input list<Absyn.NamedArg> inNamedArg;
-  input Boolean impl;
-  input Prefix.Prefix inPrefix;
-  input Absyn.Info info;
-  output Env.Cache outCache;
-  output DAE.Exp outExp;
-  output DAE.Properties outProperties;
-algorithm
-  (outCache,outExp,outProperties):=
-  matchcontinue (inCache,inEnv,expl,inNamedArg,impl,inPrefix,info)
-    local 
-      Absyn.Exp x,y,n;
-      DAE.Exp x1,y1,n1,x2,y2, call;
-      DAE.Type tp1,tp2,tp3,tp11,tp22;
-      DAE.Const c1,c2,c3,c;
-      Integer size;
-      Env.Cache cache; Env.Env env;
-      Prefix.Prefix pre;
-      DAE.ExpType res_type;
-
-    /* linspace(x,y,n) where n is constant or parameter */
-    case (cache,env,{x,y,n},_,impl,pre,info) equation
-      (cache,x1,DAE.PROP(tp1,c1),_) = elabExp(cache,env, x, impl,NONE(),true,pre,info);
-      (cache,y1,DAE.PROP(tp2,c2),_) = elabExp(cache,env, y, impl,NONE(),true,pre,info);
-      (x2,tp11) = Types.matchType(x1,tp1,DAE.T_REAL_DEFAULT,true);
-      (y2,tp22) = Types.matchType(y1,tp2,DAE.T_REAL_DEFAULT,true);
-      (cache,n1,DAE.PROP(tp3 as (DAE.T_INTEGER(_),_),c3),_) = 
-        elabExp(cache,env, n, impl,NONE(),true,pre,info);
-      true = Types.isParameterOrConstant(c3);
-      (cache,Values.INTEGER(size),_) = 
-        Ceval.ceval(cache,env, n1, false,NONE(), Ceval.MSG(info));
-      c = Types.constAnd(c1,c2);
-      res_type = DAE.ET_ARRAY(DAE.ET_REAL(), {DAE.DIM_INTEGER(size)});
-      call = Expression.makeBuiltinCall("linspace", {x2, y2, n1}, res_type);
-    then (cache, call, DAE.PROP((DAE.T_ARRAY(DAE.DIM_INTEGER(size),tp11),NONE()),c));
-
-    /* linspace(x,y,n) where n is variable time expression */
-    case (cache,env,{x,y,n},_,impl,pre,info) equation
-      (cache,x1,DAE.PROP(tp1,c1),_) = elabExp(cache,env, x, impl,NONE(),true,pre,info);
-      (cache,y1,DAE.PROP(tp2,c2),_) = elabExp(cache,env, y, impl,NONE(),true,pre,info);
-      (x2,tp11) = Types.matchType(x1,tp1,DAE.T_REAL_DEFAULT,true);
-      (y2,tp22) = Types.matchType(y1,tp2,DAE.T_REAL_DEFAULT,true);
-      (cache,n1,DAE.PROP(tp3 as (DAE.T_INTEGER(_),_),c3),_) = 
-        elabExp(cache,env, n, impl,NONE(),true,pre,info);
-      false = Types.isParameterOrConstant(c3);
-      c = Types.constAnd(c1,Types.constAnd(c2,c3));
-      res_type = DAE.ET_ARRAY(DAE.ET_REAL(), {DAE.DIM_UNKNOWN()});
-      call = Expression.makeBuiltinCall("linspace", {x2, y2, n1}, res_type);
-    then (cache, call, DAE.PROP((DAE.T_ARRAY(DAE.DIM_UNKNOWN(),tp11),NONE()),c));
-  end matchcontinue;
-end elabBuiltinLinspace;
-
 protected function elabBuiltinVector "function: elabBuiltinVector
   author: PA
 
@@ -6111,7 +6049,6 @@ algorithm
     case "skew" then elabBuiltinSkew;
     case "String" then elabBuiltinString;
     case "rooted" then elabBuiltinRooted;
-    case "linspace" then elabBuiltinLinspace;
     case "Integer" then elabBuiltinIntegerEnum;
     case "inStream" then elabBuiltinInStream;
     case "actualStream" then elabBuiltinActualStream;