Added API getDerivedUnits

OpenModelica · Mar 22, 2016 · 05d473a · 05d473a
1 parent b98debe
commit 05d473a
Show file tree

Hide file tree

Showing 7 changed files with 76 additions and 0 deletions.
diff --git a/Compiler/FrontEnd/ModelicaBuiltin.mo b/Compiler/FrontEnd/ModelicaBuiltin.mo
@@ -2037,6 +2037,15 @@ annotation(preferredView="text",Documentation(info="<html>
 </html>"));
 end convertUnits;
 
+function getDerivedUnits
+  input String baseUnit;
+  output String[:] derivedUnits;
+external "builtin";
+annotation(preferredView="text",Documentation(info="<html>
+<p>Returns the list of derived units for the specified base unit.</p>
+</html>"));
+end getDerivedUnits;
+
 function listVariables "Lists the names of the active variables in the scripting environment."
   output TypeName variables[:];
 external "builtin";

diff --git a/Compiler/FrontEnd/UnitAbsynBuilder.mo b/Compiler/FrontEnd/UnitAbsynBuilder.mo
@@ -1550,6 +1550,37 @@ algorithm
   unit := UnitAbsyn.SPECIFIED(UnitAbsyn.SPECUNIT(typeParams,units));
 end str2unitWithScaleFactor;
 
+protected function getDerivedUnitsHelper
+  input UnitAbsyn.Unit baseUnit;
+  input String baseUnitStr;
+  input list<String> inUnits;
+  output list<String> outUnits = {};
+protected
+  UnitAbsyn.Unit unit;
+  Boolean b;
+algorithm
+  for unitStr in inUnits loop
+    if boolNot(stringEq(baseUnitStr, unitStr)) then // skip same units
+	    unit := str2unit(unitStr, NONE());
+	    b := valueEq(baseUnit, unit);
+	    if b then
+	      outUnits := unitStr::outUnits;
+	    end if;
+	  end if;
+  end for;
+end getDerivedUnitsHelper;
+
+public function getDerivedUnits
+  input UnitAbsyn.Unit baseUnit;
+  input String baseUnitStr;
+  output list<String> derivedUnits;
+protected
+  list<String> unitSymbols;
+algorithm
+  unitSymbols := UnitParserExt.allUnitSymbols();
+  derivedUnits := getDerivedUnitsHelper(baseUnit, baseUnitStr, unitSymbols);
+end getDerivedUnits;
+
 /* Tests  */
 
 /* Test1:

diff --git a/Compiler/FrontEnd/UnitParserExt.mo b/Compiler/FrontEnd/UnitParserExt.mo
@@ -59,6 +59,11 @@ public function str2unit "Translate a unit string to a unit"
   external "C" UnitParserExt_str2unit(res,noms,denoms,tpnoms,tpdenoms,tpstrs,scaleFactor,offset) annotation(Library = "omcruntime");
 end str2unit;
 
+public function allUnitSymbols
+  output list<String> unitSymbols;
+  external "C" unitSymbols = UnitParserExtImpl__allUnitSymbols() annotation(Library = "omcruntime");
+end allUnitSymbols;
+
 public function addBase "adds a base unit without weight"
   input String name;
   external "C" UnitParserExtImpl__addBase(name) annotation(Library = "omcruntime");

diff --git a/Compiler/Script/CevalScriptBackend.mo b/Compiler/Script/CevalScriptBackend.mo
@@ -827,6 +827,20 @@ algorithm
       then
         (cache,Values.TUPLE({Values.BOOL(false),Values.REAL(1.0),Values.REAL(0.0)}),st);
 
+    case (cache,_,"getDerivedUnits",{Values.STRING(str1)},st,_)
+      equation
+        Error.clearMessages() "Clear messages";
+        UnitParserExt.initSIUnits();
+        u1 = UnitAbsynBuilder.str2unit(str1, NONE());
+        strs = UnitAbsynBuilder.getDerivedUnits(u1, str1);
+        v = ValuesUtil.makeArray(List.map(strs, ValuesUtil.makeString));
+      then
+        (cache,v,st);
+
+    case (cache,_,"getDerivedUnits",{Values.STRING(str1)},st,_)
+      then
+        (cache,ValuesUtil.makeArray({}),st);
+
     case (cache,_,"getClassInformation",{Values.CODE(Absyn.C_TYPENAME(className))},st as GlobalScript.SYMBOLTABLE(),_)
       equation
         v = getClassInformation(className, st.ast);

diff --git a/Compiler/runtime/unitparser.cpp b/Compiler/runtime/unitparser.cpp
@@ -34,6 +34,7 @@
 #include <sstream>
 #include <stack>
 #include "omc_msvc.h" /* For round() */
+#include "meta_modelica.h"
 
 #ifndef NO_LPLIB
 
@@ -288,6 +289,15 @@ void UnitParser::addPrefix(const string symbol, Rational exponent) {
   _prefix[symbol] = exponent;
 }
 
+void* UnitParser::allUnitSymbols()
+{
+  void* res = mmc_mk_nil();
+  for (map<string, Unit>::iterator p = _units.begin(); p != _units.end(); p++) {
+    res = mmc_mk_cons(mmc_mk_scon((*p).second.unitSymbol.c_str()), res);
+  }
+  return res;
+}
+
 void UnitParser::addBase(const string quantityName, const string unitName,
 
     const string unitSymbol, bool prefixAllowed) {

diff --git a/Compiler/runtime/unitparser.h b/Compiler/runtime/unitparser.h
@@ -227,6 +227,8 @@ class UnitParser{
   /** Add prefix symbols. E.g. "m" has exponent -3, (m=10^-3) */
   void addPrefix(const string symbol, Rational exponent);
 
+  void* allUnitSymbols();
+
   /**
     Add a base quantity/unit
       @param prefixAllowed Normally set to true. Should be false for [kg], since we are not allowed to prefix this base unit.

diff --git a/Compiler/runtime/unitparserext.cpp b/Compiler/runtime/unitparserext.cpp
@@ -55,6 +55,11 @@ void UnitParserExtImpl__registerWeight(const char *name, double weight)
  unitParser->accumulateWeight(name,weight);
 }
 
+void* UnitParserExtImpl__allUnitSymbols()
+{
+  return unitParser->allUnitSymbols();
+}
+
 void UnitParserExtImpl__addBase(const char *name)
 {
    //cout << "addBase(" << name << ")"<<endl;