Skip to content

Commit

Permalink
- handling task #1269
Browse files Browse the repository at this point in the history
- partial implementation of stream connectors
  + connection of stream connectors works now

- remains to implement support for inStream and actualStream operators
  (see Inst.evalActualStream and Inst.evalInStream)
- the handling of inStream and actualStream operators is disable for now,
  to enable, uncomment the call to: Inst.handleStreamConnectors inside Inst.instClass

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@6062 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Sep 9, 2010
1 parent 1a95d56 commit bbbea5c
Show file tree
Hide file tree
Showing 8 changed files with 717 additions and 84 deletions.
2 changes: 2 additions & 0 deletions Compiler/Builtin.mo
Expand Up @@ -2862,6 +2862,8 @@ algorithm
env = Env.extendFrameT(env, "mod", intInt2int);
env = Env.extendFrameT(env, "constrain", realrealreal2real);
env = Env.extendFrameT(env, "constrain", array1dimrealarray1dimrealarray1dimreal2array1dimreal);
env = Env.extendFrameT(env, "actualStream", real2real);
env = Env.extendFrameT(env, "inStream", real2real);
/*
env = Env.extendFrameT(env, "semiLinear", realRealReal2real);
env = Env.extendFrameT(env, "delay", realReal2real);
Expand Down
4 changes: 3 additions & 1 deletion Compiler/CevalScript.mo
Expand Up @@ -3888,6 +3888,8 @@ algorithm
case (cache,env,className,(st as Interactive.SYMBOLTABLE(ast = p,explodedAst = sp,instClsLst = ic,lstVarVal = iv,compiledFunctions = cf)),msg)
equation
allClassPaths = getAllClassPathsRecursive(className, p);
// allClassPaths = listReverse(allClassPaths);
print("Number of classes to check: " +& intString(listLength(allClassPaths)) +& "\n");
// print ("All paths: \n" +& Util.stringDelimitList(Util.listMap(allClassPaths, Absyn.pathString), "\n") +& "\n");
checkAll(cache, env, allClassPaths, st, msg);
then
Expand Down Expand Up @@ -3960,7 +3962,7 @@ algorithm
print("Checking: " +& Dump.unparseClassAttributesStr(c) +& " " +& Absyn.pathString(className) +& "... ");
t1 = clock();
_ = OptManager.setOption("checkModel", true);
(cache,Values.STRING(str),_) = checkModel(cache, env, className, st, msg);
(_,Values.STRING(str),_) = checkModel(cache, env, className, st, msg);
_ = OptManager.setOption("checkModel", false);
t2 = clock(); elapsedTime = t2 -. t1; s = realString(elapsedTime);
print (s +& " seconds -> " +& failOrSuccess(str) +& "\n\t");
Expand Down
4 changes: 4 additions & 0 deletions Compiler/Connect.mo
Expand Up @@ -72,6 +72,10 @@ uniontype Set "A connection set is represented using the Set type."
list<tuple<DAE.ComponentRef, Face, DAE.ElementSource>> tplExpComponentRefFaceLst;
end FLOW;

record STREAM "a list of component reference for stream, a component reference for corresponding flow and a face"
list<tuple<DAE.ComponentRef, Option<DAE.ComponentRef>, Face, DAE.ElementSource>> tplExpComponentRefFaceLst;
end STREAM;

end Set;

public
Expand Down

0 comments on commit bbbea5c

Please sign in to comment.