]> gerrit.simantics Code Review - simantics/sysdyn.git/commit
Merge changes from trunk
authorjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Mon, 31 Mar 2014 07:59:55 +0000 (07:59 +0000)
committerjkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Mon, 31 Mar 2014 07:59:55 +0000 (07:59 +0000)
commit37e89ee306781f10f0bc2a338a3c0dd68e4c9ac6
tree3ca67f7a83637811e9c7aa9e1838a7a60b85ffa0
parent9274c5e8b5477ebf0739fb46dbab66aad5a93fbf
Merge changes from trunk

refs #2924

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches@29220 ac1ea38d-2e2b-0410-8846-a27921b304fc
123 files changed:
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/And.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Application.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Argument.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArgumentList.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ArraySliceExpression.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Assignment.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Declaration.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivate.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Derivative.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/EnumElementsVariableBase.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/EnumSizeVariableBase.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Equals.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForArray.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ForIndex.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Frame.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Function.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterOrEqualThan.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/GreaterThan.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IEnvironment.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IExpression.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IFrame.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/IfThenElse.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessOrEqualThan.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LessThan.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/LineReader.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/MultiStatement.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NotEquals.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NullModification.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Or.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ParameterDeclaration.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/SolverUtils.java [new file with mode: 0644]
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Statement.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/TimeVariable.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableDeclaration.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTokenManager.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParserTreeConstants.java
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
dev-jkauttio/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
dev-jkauttio/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
dev-jkauttio/org.simantics.modelica/src/org/simantics/modelica/data/SimulationResult.java
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Bathtub.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Ceiling.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Decay.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Extrapolation.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Extrapolation.sysdynModule [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Floor.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/MoleculeFunctions.sysdynFunctions [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Multivariate Anchoring And Adjustment.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Protected Sea Ancoring And Adjustment.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Sea Anchoring And Adjustment.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Smooth.sysdynModule
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/SmoothThirdOrder.sysdynModule
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Tester For Molecules.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Trend.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Trend.sysdynModule [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/Univariate Anchoring And Adjustment.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/molecules/WeighedAverage.sysdyn [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Discovery And Exploitation Of Resources.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Global Carbon Cycle.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Predator And Limited Prey.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Resource Exploitation Use Recycling.sysdyn
dev-jkauttio/org.simantics.sysdyn.feature/rootfiles/sampleModels/Tourists Environments And Hotel Facilities.sysdyn
dev-jkauttio/org.simantics.sysdyn.ontology/graph.tg
dev-jkauttio/org.simantics.sysdyn.ontology/graph/Sysdyn.pgraph
dev-jkauttio/org.simantics.sysdyn.ontology/graph/SysdynFunctions.pgraph
dev-jkauttio/org.simantics.sysdyn.ontology/graph/VensimFunctions.pgraph
dev-jkauttio/org.simantics.sysdyn.ontology/src/org/simantics/sysdyn/SysdynResource.java
dev-jkauttio/org.simantics.sysdyn.ui/icons/equalizer.png [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.ui/plugin.properties
dev-jkauttio/org.simantics.sysdyn.ui/plugin.xml
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyConnectionFactory.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/function/ModulesSearchFunction.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SynthesisSimulation.java [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/SysdynExperimentActivator.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/ToggleSimulation.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/exports/ExportModelHandler.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/listeners/SysdynExperimentListener.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/SysdynDiagramPreferencePage.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/SysdynDiagramPreferences.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/preferences/SysdynDiagramPreferencesInitializer.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/project/SysdynProject.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/ConfigurationTab.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/expressions/DelayExpression.java
dev-jkauttio/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendView.java
dev-jkauttio/org.simantics.sysdyn/scl/Sysdyn.scl
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/adapter/ValueIndexVariable.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/expressionParser/ExpressionParser.jj
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/OldSysdynExperiment.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelParser.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/modelParser/ModelicaParser.jj
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/modelica/ModelicaWriter.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/representation/Shadow.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/InternalSolver.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/SysdynSimulationJob.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/DocumentationUtils.java
dev-jkauttio/org.simantics.sysdyn/src/org/simantics/sysdyn/utils/Function.java
dev-jkauttio/org.simantics.sysdyn/testModels/MaintenanceModel_2012-12-03.tg [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn/testModels/Model1412Health.tg [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn/testModels/WorkModel_2012-12-03.tg [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn/testModels/openprod_demo_2012-12-03.tg [new file with mode: 0644]
dev-jkauttio/org.simantics.sysdyn/testModels/references.txt [new file with mode: 0644]