From 944778940543304bfef9bdeca9c758488d2a7cab Mon Sep 17 00:00:00 2001 From: fvanderlinden Date: Thu, 18 Jun 2015 10:46:55 +0200 Subject: [PATCH] Removed unnecessary ModelManagement dependency. Updated to version 0.6.3 --- .../Examples/ActuatorExample/Actuator.mo | 2 +- .../ActuatorExample/ActuatorPackage.mo | 4 +- .../Actuator_ParameterFaults.mo | 2 +- .../Examples/ActuatorExample/package.mo | 2 +- FaultTriggering/Examples/package.mo | 2 +- .../FaultOutput/ConstantBooleanFault.mo | 2 +- .../FaultOutput/ConstantIntegerFault.mo | 2 +- .../FaultOutput/ConstantRealFault.mo | 2 +- .../FaultOutput/ExternalFaultTrigger.mo | 2 +- FaultTriggering/FaultOutput/FaultTrigger.mo | 2 +- .../Internal/InternalBooleanFault.mo | 2 +- .../Internal/InternalConstantBooleanFault.mo | 2 +- .../Internal/InternalConstantIntegerFault.mo | 2 +- .../Internal/InternalConstantRealFault.mo | 2 +- .../Internal/InternalIntegerFault.mo | 2 +- .../FaultOutput/Internal/InternalRealFault.mo | 2 +- .../FaultOutput/Partial_FaultTrigger.mo | 2 +- .../FaultOutput/VariableBooleanFault.mo | 2 +- .../FaultOutput/VariableIntegerFault.mo | 2 +- .../FaultOutput/VariableRealFault.mo | 2 +- FaultTriggering/UsersGuide/Contact.mo | 2 +- FaultTriggering/UsersGuide/Overview.mo | 2 +- .../Tutorial/AutomaticModelReconfiguration.mo | 2 +- .../UsersGuide/Tutorial/FaultModelSetup.mo | 2 +- .../UsersGuide/Tutorial/FaultModelling.mo | 2 +- .../UsersGuide/Tutorial/FaultSimulation.mo | 2 +- .../UsersGuide/Tutorial/GettingStarted.mo | 2 +- .../UsersGuide/Tutorial/Important.mo | 2 +- .../Tutorial/ParameterAndVariableFaults.mo | 2 +- .../UsersGuide/Tutorial/package.mo | 2 +- FaultTriggering/UsersGuide/package.mo | 2 +- .../Utilities/Icons/Controller/package.mo | 2 +- .../Utilities/Icons/Fault/package.mo | 2 +- .../Icons/MotorController/package.mo | 2 +- .../Utilities/Icons/Package/package.mo | 2 +- .../Utilities/Icons/Records/package.mo | 2 +- .../Icons/TranslationalActuators/package.mo | 2 +- .../Utilities/Icons/TypesPackage/package.mo | 2 +- .../Utilities/Icons/Utilities/package.mo | 2 +- FaultTriggering/Utilities/Icons/package.mo | 2 +- .../Internal/createFaultPackageInternal.mo | 3 +- .../Utilities/Internal/gatherFaults.mo | 71 -------- .../Internal/getAllModelComponents.mo | 162 ------------------ FaultTriggering/Utilities/Internal/package.mo | 19 -- .../Utilities/Internal/package.order | 10 +- .../Utilities/Records/BooleanFaultValue.mo | 2 +- .../Utilities/Records/BooleanFaults.mo | 2 +- FaultTriggering/Utilities/Records/Faults.mo | 2 +- .../Utilities/Records/IntegerFaultValue.mo | 2 +- .../Utilities/Records/IntegerFaults.mo | 2 +- .../Utilities/Records/Parameter_Faults.mo | 2 +- .../Utilities/Records/RealFaultValue.mo | 2 +- .../Utilities/Records/RealFaults.mo | 2 +- .../Utilities/Records/Variable_Faults.mo | 2 +- FaultTriggering/Utilities/Types/FaultType.mo | 2 +- .../Types/Fault_SelectBooleanFault.mo | 2 +- .../Types/Fault_SelectIntegerFault.mo | 2 +- .../Utilities/Types/Fault_SelectRealFault.mo | 2 +- .../Types/Parameter_Fault_Boolean.mo | 2 +- .../Types/Parameter_Fault_Integer.mo | 2 +- .../Utilities/Types/Parameter_Fault_Real.mo | 2 +- .../Utilities/Types/Variable_Fault_Boolean.mo | 2 +- .../Utilities/Types/Variable_Fault_Integer.mo | 2 +- .../Utilities/Types/Variable_Fault_Real.mo | 2 +- FaultTriggering/createFaultPackage.mo | 2 +- FaultTriggering/libraryinfo.mos | 6 +- FaultTriggering/package.mo | 14 +- README.md | 69 ++++---- 68 files changed, 114 insertions(+), 362 deletions(-) delete mode 100644 FaultTriggering/Utilities/Internal/gatherFaults.mo delete mode 100644 FaultTriggering/Utilities/Internal/getAllModelComponents.mo diff --git a/FaultTriggering/Examples/ActuatorExample/Actuator.mo b/FaultTriggering/Examples/ActuatorExample/Actuator.mo index 9e834fb..2be6815 100644 --- a/FaultTriggering/Examples/ActuatorExample/Actuator.mo +++ b/FaultTriggering/Examples/ActuatorExample/Actuator.mo @@ -193,7 +193,7 @@ wrapper model is made of this model.")}), ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Examples/ActuatorExample/ActuatorPackage.mo b/FaultTriggering/Examples/ActuatorExample/ActuatorPackage.mo index 70c2dce..c1b17e5 100644 --- a/FaultTriggering/Examples/ActuatorExample/ActuatorPackage.mo +++ b/FaultTriggering/Examples/ActuatorExample/ActuatorPackage.mo @@ -108,7 +108,7 @@ end FaultRecord; connector FaultsInput = input ActuatorPackage.Interfaces.Faults "'input Faults' as connector" annotation (Icon(graphics={Rectangle(extent={{-8,4},{10,0}},lineColor={255,0,0}, - lineThickness = 0.5)})); + lineThickness= 0.5)})); package Interfaces extends FaultTriggering.Utilities.Icons.InterfacesPackage; connector Faults @@ -160,7 +160,7 @@ end Interfaces; annotation (Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Examples/ActuatorExample/Actuator_ParameterFaults.mo b/FaultTriggering/Examples/ActuatorExample/Actuator_ParameterFaults.mo index 62e44a7..b4a737f 100644 --- a/FaultTriggering/Examples/ActuatorExample/Actuator_ParameterFaults.mo +++ b/FaultTriggering/Examples/ActuatorExample/Actuator_ParameterFaults.mo @@ -183,7 +183,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Examples/ActuatorExample/package.mo b/FaultTriggering/Examples/ActuatorExample/package.mo index cbb648f..22bf94e 100644 --- a/FaultTriggering/Examples/ActuatorExample/package.mo +++ b/FaultTriggering/Examples/ActuatorExample/package.mo @@ -13,7 +13,7 @@ package ActuatorExample ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Examples/package.mo b/FaultTriggering/Examples/package.mo index 4cf5804..a89c877 100644 --- a/FaultTriggering/Examples/package.mo +++ b/FaultTriggering/Examples/package.mo @@ -6,7 +6,7 @@ package Examples "Examples how to use the FaultTriggering toolbox" annotation ( Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/ConstantBooleanFault.mo b/FaultTriggering/FaultOutput/ConstantBooleanFault.mo index 41845f4..0b67cdd 100644 --- a/FaultTriggering/FaultOutput/ConstantBooleanFault.mo +++ b/FaultTriggering/FaultOutput/ConstantBooleanFault.mo @@ -72,7 +72,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/ConstantIntegerFault.mo b/FaultTriggering/FaultOutput/ConstantIntegerFault.mo index 926d29d..9ee3aa8 100644 --- a/FaultTriggering/FaultOutput/ConstantIntegerFault.mo +++ b/FaultTriggering/FaultOutput/ConstantIntegerFault.mo @@ -78,7 +78,7 @@ Documentation(info=" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/ConstantRealFault.mo b/FaultTriggering/FaultOutput/ConstantRealFault.mo index 4ac4673..2442580 100644 --- a/FaultTriggering/FaultOutput/ConstantRealFault.mo +++ b/FaultTriggering/FaultOutput/ConstantRealFault.mo @@ -79,7 +79,7 @@ Documentation(info=" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/ExternalFaultTrigger.mo b/FaultTriggering/FaultOutput/ExternalFaultTrigger.mo index 052beb5..92813c4 100644 --- a/FaultTriggering/FaultOutput/ExternalFaultTrigger.mo +++ b/FaultTriggering/FaultOutput/ExternalFaultTrigger.mo @@ -22,7 +22,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/FaultTrigger.mo b/FaultTriggering/FaultOutput/FaultTrigger.mo index bc44e00..f97d602 100644 --- a/FaultTriggering/FaultOutput/FaultTrigger.mo +++ b/FaultTriggering/FaultOutput/FaultTrigger.mo @@ -38,7 +38,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalBooleanFault.mo b/FaultTriggering/FaultOutput/Internal/InternalBooleanFault.mo index ba320bd..ef162d8 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalBooleanFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalBooleanFault.mo @@ -25,7 +25,7 @@ fault_local; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalConstantBooleanFault.mo b/FaultTriggering/FaultOutput/Internal/InternalConstantBooleanFault.mo index 17a4256..ff02e48 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalConstantBooleanFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalConstantBooleanFault.mo @@ -31,7 +31,7 @@ block InternalConstantBooleanFault "Generate constant Fault of type Boolean" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalConstantIntegerFault.mo b/FaultTriggering/FaultOutput/Internal/InternalConstantIntegerFault.mo index ec6f435..a30997c 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalConstantIntegerFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalConstantIntegerFault.mo @@ -26,7 +26,7 @@ Documentation(info=" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalConstantRealFault.mo b/FaultTriggering/FaultOutput/Internal/InternalConstantRealFault.mo index 1bef78a..cd3962a 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalConstantRealFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalConstantRealFault.mo @@ -26,7 +26,7 @@ Documentation(info=" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalIntegerFault.mo b/FaultTriggering/FaultOutput/Internal/InternalIntegerFault.mo index 2f782b2..21c03c4 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalIntegerFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalIntegerFault.mo @@ -26,7 +26,7 @@ fault_local; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Internal/InternalRealFault.mo b/FaultTriggering/FaultOutput/Internal/InternalRealFault.mo index 78e6334..3de9792 100644 --- a/FaultTriggering/FaultOutput/Internal/InternalRealFault.mo +++ b/FaultTriggering/FaultOutput/Internal/InternalRealFault.mo @@ -25,7 +25,7 @@ fault_local; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/Partial_FaultTrigger.mo b/FaultTriggering/FaultOutput/Partial_FaultTrigger.mo index b3450b1..9c6be40 100644 --- a/FaultTriggering/FaultOutput/Partial_FaultTrigger.mo +++ b/FaultTriggering/FaultOutput/Partial_FaultTrigger.mo @@ -72,7 +72,7 @@ partial model Partial_FaultTrigger "partial model defining the fault classes" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/VariableBooleanFault.mo b/FaultTriggering/FaultOutput/VariableBooleanFault.mo index 03f4b33..038c366 100644 --- a/FaultTriggering/FaultOutput/VariableBooleanFault.mo +++ b/FaultTriggering/FaultOutput/VariableBooleanFault.mo @@ -101,7 +101,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/VariableIntegerFault.mo b/FaultTriggering/FaultOutput/VariableIntegerFault.mo index fbab4c3..e3aa220 100644 --- a/FaultTriggering/FaultOutput/VariableIntegerFault.mo +++ b/FaultTriggering/FaultOutput/VariableIntegerFault.mo @@ -101,7 +101,7 @@ y = fault; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/FaultOutput/VariableRealFault.mo b/FaultTriggering/FaultOutput/VariableRealFault.mo index 49dcf82..251528c 100644 --- a/FaultTriggering/FaultOutput/VariableRealFault.mo +++ b/FaultTriggering/FaultOutput/VariableRealFault.mo @@ -102,7 +102,7 @@ equation ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Contact.mo b/FaultTriggering/UsersGuide/Contact.mo index 1bea7a6..1ea2165 100644 --- a/FaultTriggering/UsersGuide/Contact.mo +++ b/FaultTriggering/UsersGuide/Contact.mo @@ -28,7 +28,7 @@ class Contact "Contact information" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Overview.mo b/FaultTriggering/UsersGuide/Overview.mo index b8fb612..a008c7f 100644 --- a/FaultTriggering/UsersGuide/Overview.mo +++ b/FaultTriggering/UsersGuide/Overview.mo @@ -20,7 +20,7 @@ class Overview ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/AutomaticModelReconfiguration.mo b/FaultTriggering/UsersGuide/Tutorial/AutomaticModelReconfiguration.mo index f193db9..a3fd8be 100644 --- a/FaultTriggering/UsersGuide/Tutorial/AutomaticModelReconfiguration.mo +++ b/FaultTriggering/UsersGuide/Tutorial/AutomaticModelReconfiguration.mo @@ -14,7 +14,7 @@ model AutomaticModelReconfiguration "Automatic Model Reconfiguration" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/FaultModelSetup.mo b/FaultTriggering/UsersGuide/Tutorial/FaultModelSetup.mo index d582fa0..e42c536 100644 --- a/FaultTriggering/UsersGuide/Tutorial/FaultModelSetup.mo +++ b/FaultTriggering/UsersGuide/Tutorial/FaultModelSetup.mo @@ -55,7 +55,7 @@ driveline.speedSensor.constBooleanFault=0;//Boolean% ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/FaultModelling.mo b/FaultTriggering/UsersGuide/Tutorial/FaultModelling.mo index 8192e98..167fcec 100644 --- a/FaultTriggering/UsersGuide/Tutorial/FaultModelling.mo +++ b/FaultTriggering/UsersGuide/Tutorial/FaultModelling.mo @@ -34,7 +34,7 @@ extends FaultTriggering.Utilities.Icons.Information; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/FaultSimulation.mo b/FaultTriggering/UsersGuide/Tutorial/FaultSimulation.mo index 6b1009d..49b08df 100644 --- a/FaultTriggering/UsersGuide/Tutorial/FaultSimulation.mo +++ b/FaultTriggering/UsersGuide/Tutorial/FaultSimulation.mo @@ -18,7 +18,7 @@ extends FaultTriggering.Utilities.Icons.Information; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/GettingStarted.mo b/FaultTriggering/UsersGuide/Tutorial/GettingStarted.mo index 0f87b43..28dab91 100644 --- a/FaultTriggering/UsersGuide/Tutorial/GettingStarted.mo +++ b/FaultTriggering/UsersGuide/Tutorial/GettingStarted.mo @@ -19,7 +19,7 @@ extends FaultTriggering.Utilities.Icons.Information; ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/Important.mo b/FaultTriggering/UsersGuide/Tutorial/Important.mo index e7782fe..b11b8df 100644 --- a/FaultTriggering/UsersGuide/Tutorial/Important.mo +++ b/FaultTriggering/UsersGuide/Tutorial/Important.mo @@ -10,7 +10,7 @@ model Important "Important Notes" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/ParameterAndVariableFaults.mo b/FaultTriggering/UsersGuide/Tutorial/ParameterAndVariableFaults.mo index bde7081..fb46c0e 100644 --- a/FaultTriggering/UsersGuide/Tutorial/ParameterAndVariableFaults.mo +++ b/FaultTriggering/UsersGuide/Tutorial/ParameterAndVariableFaults.mo @@ -34,7 +34,7 @@ model ParameterAndVariableFaults "Parameter and Variable Faults" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/Tutorial/package.mo b/FaultTriggering/UsersGuide/Tutorial/package.mo index 27b5300..880137a 100644 --- a/FaultTriggering/UsersGuide/Tutorial/package.mo +++ b/FaultTriggering/UsersGuide/Tutorial/package.mo @@ -18,7 +18,7 @@ package Tutorial "Tutorial" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/UsersGuide/package.mo b/FaultTriggering/UsersGuide/package.mo index 41b7a72..f3403ca 100644 --- a/FaultTriggering/UsersGuide/package.mo +++ b/FaultTriggering/UsersGuide/package.mo @@ -8,7 +8,7 @@ package UsersGuide "User's guide" ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Icons/Controller/package.mo b/FaultTriggering/Utilities/Icons/Controller/package.mo index f376c67..932fcc1 100644 --- a/FaultTriggering/Utilities/Icons/Controller/package.mo +++ b/FaultTriggering/Utilities/Icons/Controller/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package Controller +partial package Controller extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/Fault/package.mo b/FaultTriggering/Utilities/Icons/Fault/package.mo index 3131372..499790f 100644 --- a/FaultTriggering/Utilities/Icons/Fault/package.mo +++ b/FaultTriggering/Utilities/Icons/Fault/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package Fault +partial package Fault extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/MotorController/package.mo b/FaultTriggering/Utilities/Icons/MotorController/package.mo index 2dc8b3b..8561c9c 100644 --- a/FaultTriggering/Utilities/Icons/MotorController/package.mo +++ b/FaultTriggering/Utilities/Icons/MotorController/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package MotorController +partial package MotorController extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/Package/package.mo b/FaultTriggering/Utilities/Icons/Package/package.mo index 83d05e7..1131de3 100644 --- a/FaultTriggering/Utilities/Icons/Package/package.mo +++ b/FaultTriggering/Utilities/Icons/Package/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -package Package +package Package annotation (Icon(graphics={ diff --git a/FaultTriggering/Utilities/Icons/Records/package.mo b/FaultTriggering/Utilities/Icons/Records/package.mo index d27d812..7a47d8a 100644 --- a/FaultTriggering/Utilities/Icons/Records/package.mo +++ b/FaultTriggering/Utilities/Icons/Records/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package Records +partial package Records extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/TranslationalActuators/package.mo b/FaultTriggering/Utilities/Icons/TranslationalActuators/package.mo index 157f96f..5a666ff 100644 --- a/FaultTriggering/Utilities/Icons/TranslationalActuators/package.mo +++ b/FaultTriggering/Utilities/Icons/TranslationalActuators/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package TranslationalActuators +partial package TranslationalActuators annotation (Icon(graphics={ diff --git a/FaultTriggering/Utilities/Icons/TypesPackage/package.mo b/FaultTriggering/Utilities/Icons/TypesPackage/package.mo index f53496f..c3cab93 100644 --- a/FaultTriggering/Utilities/Icons/TypesPackage/package.mo +++ b/FaultTriggering/Utilities/Icons/TypesPackage/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -partial package TypesPackage +partial package TypesPackage extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/Utilities/package.mo b/FaultTriggering/Utilities/Icons/Utilities/package.mo index d569770..6503f86 100644 --- a/FaultTriggering/Utilities/Icons/Utilities/package.mo +++ b/FaultTriggering/Utilities/Icons/Utilities/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities.Icons; -package Utilities +package Utilities extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Icons/package.mo b/FaultTriggering/Utilities/Icons/package.mo index d24a7de..c36645b 100644 --- a/FaultTriggering/Utilities/Icons/package.mo +++ b/FaultTriggering/Utilities/Icons/package.mo @@ -1,5 +1,5 @@ within FaultTriggering.Utilities; -package Icons +package Icons extends FaultTriggering.Utilities.Icons.Package; diff --git a/FaultTriggering/Utilities/Internal/createFaultPackageInternal.mo b/FaultTriggering/Utilities/Internal/createFaultPackageInternal.mo index 4a4081b..b2e4f21 100644 --- a/FaultTriggering/Utilities/Internal/createFaultPackageInternal.mo +++ b/FaultTriggering/Utilities/Internal/createFaultPackageInternal.mo @@ -391,8 +391,7 @@ Streams.print("extends FaultTriggering.Utilities.Icons.InterfacesPackage;", pack end for; if Strings.compare(extendsTo[nameNr2], "") <> Modelica.Utilities.Types.Compare.Equal then Streams.print("end " + name[nameNr2] + ";", packageName); - end if; - processedNames :=cat( + end if; processedNames :=cat( 1, processedNames, {nameNr}); diff --git a/FaultTriggering/Utilities/Internal/gatherFaults.mo b/FaultTriggering/Utilities/Internal/gatherFaults.mo deleted file mode 100644 index f76a5c1..0000000 --- a/FaultTriggering/Utilities/Internal/gatherFaults.mo +++ /dev/null @@ -1,71 +0,0 @@ -within FaultTriggering.Utilities.Internal; -function gatherFaults - "Select all model compontsfrom modelName which type is equal to searchString" -extends FaultTriggering.Utilities.Icons.ModelTree; - - input String modelName="FaultTriggering.Examples.ActuatorExample.Actuator"; - input Integer maxSearchSize=500 "pre allocation size of the output matrices"; - input String searchString="Fault_Real"; - output String[:] faultPaths "Path to component"; - output String[:] faultNames "Component names"; - -protected - String[maxSearchSize] faultNamesList; - String[maxSearchSize] faultFromNamesList; - String[maxSearchSize] faultPathList; - String[maxSearchSize] componentNames; - String componentName; - String[maxSearchSize] componentPaths; - String componentPath; - - Boolean[maxSearchSize] IsInputs; - Integer searchStringIndex; - Integer Index_LastDotInName; - Integer Counter_Fault=1; - Boolean IsFault; - -algorithm -// Get Components and their properties of the model - (componentNames,componentPaths) := - FaultTriggering.Utilities.Internal.getAllModelComponents(modelName, - maxSearchSize); -// Loop over all Components - for Counter_Component in 1:size(componentNames, 1) loop -// // get Typename - componentPath := componentPaths[Counter_Component]; - componentName := componentNames[Counter_Component]; - Index_LastDotInName := Modelica.Utilities.Strings.findLast(componentPath, "."); - - if Index_LastDotInName > 1 then - // look if the name FAULT is in the type, if yes ==> FAULT. This is looped for all searchString indexes. If a string is already found, no further string comparison is needed and is skipped. - IsFault := not (Modelica.Utilities.Strings.find( - componentPath, - searchString, - Index_LastDotInName) == 0); - if IsFault then // if fault then save names and default values - faultPathList[Counter_Fault] := componentPath; - faultNamesList[Counter_Fault] := componentName; - // Increase FaultCounter - Counter_Fault := Counter_Fault + 1; - end if; - end if; - end for; - - faultNames := faultNamesList[1:Counter_Fault - 1]; - faultPaths := faultPathList[1:Counter_Fault - 1]; - - annotation (Icon(graphics), - Documentation(info=" -

Select all model compontsfrom modelName which type is equal to searchString. Maximal search depth is maxSearchSize. Output are the string vectors FaultComponents and FaultNames. They represent the component names as well as the path to the component.

- - - - -


Copyright © DLR Institute of System Dynamics and Control

- - - - -
-")); -end gatherFaults; diff --git a/FaultTriggering/Utilities/Internal/getAllModelComponents.mo b/FaultTriggering/Utilities/Internal/getAllModelComponents.mo deleted file mode 100644 index 9e8291b..0000000 --- a/FaultTriggering/Utilities/Internal/getAllModelComponents.mo +++ /dev/null @@ -1,162 +0,0 @@ -within FaultTriggering.Utilities.Internal; -function getAllModelComponents - "getAllModelComponents finds all model components of a model" -extends FaultTriggering.Utilities.Icons.ModelTree; - - input String modelName="FaultTriggering.Examples.ActuatorExample.Parts.Motors.Simple"; - input Integer maxSearchSize=100 "pre allocation size of the output matrices"; - - output String[maxSearchSize] componentPath "Path to component"; - output String[maxSearchSize] componentNames "Component names"; - -protected - String[maxSearchSize] stackPath; - Boolean[maxSearchSize] isExternal; - String[maxSearchSize] pathOut; - Integer outputIndex; - Integer stackIndex=1; - Integer stackCounter; - String actualPath; -// String actualModelPath; - ModelManagement.Structure.AST.ComponentAttributes componentAttributes[:] - "Component Names"; - ModelManagement.Structure.AST.ExtendsAttributes extendsAttributes[:] - "Extends Names"; - Integer stackAddCounter=1; - -algorithm - // Set start values - stackPath[1] := modelName; - pathOut[1] := modelName; - componentPath[1] := modelName; - actualPath := modelName; - - //Loop over complete stack to make sure all indexes are used. - for stackCounter in 1:maxSearchSize loop - actualPath := stackPath[stackCounter]; - if Modelica.Utilities.Strings.length(actualPath) <> 0 then - // Process all components in "actualPath" - componentAttributes := - ModelManagement.Structure.AST.ComponentsInClassAttributes(actualPath); - for stackAddCounter in 1:size(componentAttributes, 1) loop - // check if componentname is empty - if (Modelica.Utilities.Strings.find(componentAttributes[stackAddCounter].fullTypeName, - ".") <> 0) then - stackIndex := stackIndex + 1; - assert(stackIndex < maxSearchSize,"getAllModelComponents: the pre located size of the vectors is not big enough. Please increase maxSearchSize"); - outputIndex := outputIndex + 1; - isExternal[stackIndex] := false; - stackPath[stackIndex] := componentAttributes[stackAddCounter].fullTypeName; - pathOut[stackIndex] := pathOut[stackCounter] + "." + - componentAttributes[stackAddCounter].name; - componentPath[outputIndex] := pathOut[stackIndex]; - componentNames[outputIndex] := stackPath[stackIndex]; - end if; - end for; - // Process all extends in "actualPath" - extendsAttributes := - ModelManagement.Structure.AST.ExtendsInClassAttributes(actualPath); - for stackAddCounter in 1:size(extendsAttributes, 1) loop - // check if extendname is empty - if (Modelica.Utilities.Strings.find(extendsAttributes[stackAddCounter].fullTypeName, - ".") <> 0) then - stackIndex := stackIndex + 1; - assert(stackIndex < maxSearchSize,"getAllModelComponents: the pre located size of the vectors is not big enough. Please increase maxSearchSize"); - stackPath[stackIndex] := extendsAttributes[stackAddCounter].fullTypeName; - pathOut[stackIndex] := pathOut[stackCounter]; - isExternal[stackIndex] := true; - end if; - end for; - - end if; - end for; - - annotation(__Dymola_interactive=true, - Icon(graphics), - Diagram(graphics={ - Rectangle( - extent={{-80,10},{-60,-10}}, - lineColor={0,0,255}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-20,74},{0,54}}, - lineColor={0,0,255}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{-20,-46},{0,-66}}, - lineColor={0,0,255}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,100},{60,80}}, - lineColor={0,0,255}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,48},{60,28}}, - lineColor={0,0,255}, - fillColor={255,0,0}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,-10},{60,-30}}, - lineColor={0,0,255}, - fillColor={0,0,255}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,-46},{60,-66}}, - lineColor={0,0,255}, - fillColor={255,0,0}, - fillPattern=FillPattern.Solid), - Rectangle( - extent={{40,-80},{60,-100}}, - lineColor={0,0,255}, - fillColor={255,0,0}, - fillPattern=FillPattern.Solid), - Line( - points={{-60,0},{-50,0},{-50,64},{-20,64}}, - color={0,0,0}, - smooth=Smooth.None, - thickness=0.5), - Line( - points={{-20,-56},{-50,-56},{-50,10}}, - color={0,0,0}, - thickness=0.5, - smooth=Smooth.None), - Line( - points={{40,90},{30,90},{30,38},{40,38}}, - color={0,0,0}, - thickness=0.5, - smooth=Smooth.None), - Line( - points={{40,-20},{30,-20},{30,-90},{40,-90}}, - color={0,0,0}, - thickness=0.5, - smooth=Smooth.None), - Line( - points={{0,-56},{40,-56}}, - color={0,0,0}, - thickness=0.5, - smooth=Smooth.None), - Line( - points={{0,64},{30,64}}, - color={0,0,0}, - thickness=0.5, - smooth=Smooth.None)}), - Documentation(info=" -

This function uses a stack with a maximal search size of maxSearchSize to seach all components from the model modelName. To use this function a working copy of the ModelManagement Library should be installed.

-

The output of the function are the names of the components as well as the path to the model.

-

maxSearchSize must be big enough to fit all model components, if it is not big enough, the function will be aborted and an error will triggered.

- - - - -


Copyright © DLR Institute of System Dynamics and Control

- - - - -
-")); -end getAllModelComponents; diff --git a/FaultTriggering/Utilities/Internal/package.mo b/FaultTriggering/Utilities/Internal/package.mo index eb49409..637a63d 100644 --- a/FaultTriggering/Utilities/Internal/package.mo +++ b/FaultTriggering/Utilities/Internal/package.mo @@ -2,23 +2,4 @@ within FaultTriggering.Utilities; package Internal extends FaultTriggering.Utilities.Icons.Package; - - - - - - - - - - - - - - - - - - - end Internal; diff --git a/FaultTriggering/Utilities/Internal/package.order b/FaultTriggering/Utilities/Internal/package.order index 412f325..149b0b5 100644 --- a/FaultTriggering/Utilities/Internal/package.order +++ b/FaultTriggering/Utilities/Internal/package.order @@ -1,9 +1,9 @@ faultProcessingForFaultBus createFaultPackageInternal -gatherFaults -getAllModelComponents -getVariableValues +gatherParameterFaults getParameterValues +gatherVariableFaults +getVariableValues getVariableMode readAfterDot readToDot @@ -13,7 +13,5 @@ findInIntegerVector findIfIntegerVector emptyStringVector checkInString -Records -gatherParameterFaults -gatherVariableFaults isWindows +Records diff --git a/FaultTriggering/Utilities/Records/BooleanFaultValue.mo b/FaultTriggering/Utilities/Records/BooleanFaultValue.mo index 3f7342d..1a6ddc5 100644 --- a/FaultTriggering/Utilities/Records/BooleanFaultValue.mo +++ b/FaultTriggering/Utilities/Records/BooleanFaultValue.mo @@ -8,7 +8,7 @@ type BooleanFaultValue = textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/BooleanFaults.mo b/FaultTriggering/Utilities/Records/BooleanFaults.mo index b1742c4..089cd50 100644 --- a/FaultTriggering/Utilities/Records/BooleanFaults.mo +++ b/FaultTriggering/Utilities/Records/BooleanFaults.mo @@ -9,7 +9,7 @@ record BooleanFaults "Name and property of the Boolean Value" textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/Faults.mo b/FaultTriggering/Utilities/Records/Faults.mo index 51583ec..813bfa0 100644 --- a/FaultTriggering/Utilities/Records/Faults.mo +++ b/FaultTriggering/Utilities/Records/Faults.mo @@ -30,7 +30,7 @@ parameter FaultTriggering.Utilities.Records.Variable_Faults variableFaults; textString="%name")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/IntegerFaultValue.mo b/FaultTriggering/Utilities/Records/IntegerFaultValue.mo index aec3841..53ab8b8 100644 --- a/FaultTriggering/Utilities/Records/IntegerFaultValue.mo +++ b/FaultTriggering/Utilities/Records/IntegerFaultValue.mo @@ -8,7 +8,7 @@ type IntegerFaultValue = textString="I")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/IntegerFaults.mo b/FaultTriggering/Utilities/Records/IntegerFaults.mo index 88f0f15..75875a4 100644 --- a/FaultTriggering/Utilities/Records/IntegerFaults.mo +++ b/FaultTriggering/Utilities/Records/IntegerFaults.mo @@ -9,7 +9,7 @@ record IntegerFaults "Name and property of the Integer Value" textString="I")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/Parameter_Faults.mo b/FaultTriggering/Utilities/Records/Parameter_Faults.mo index 5cd375d..e6d6df4 100644 --- a/FaultTriggering/Utilities/Records/Parameter_Faults.mo +++ b/FaultTriggering/Utilities/Records/Parameter_Faults.mo @@ -58,7 +58,7 @@ parameter FaultTriggering.Utilities.Records.BooleanFaultValue booleanValue[:] Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/RealFaultValue.mo b/FaultTriggering/Utilities/Records/RealFaultValue.mo index 56c87c6..626b501 100644 --- a/FaultTriggering/Utilities/Records/RealFaultValue.mo +++ b/FaultTriggering/Utilities/Records/RealFaultValue.mo @@ -8,7 +8,7 @@ type RealFaultValue = textString="R")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/RealFaults.mo b/FaultTriggering/Utilities/Records/RealFaults.mo index 114bae6..cccd439 100644 --- a/FaultTriggering/Utilities/Records/RealFaults.mo +++ b/FaultTriggering/Utilities/Records/RealFaults.mo @@ -9,7 +9,7 @@ record RealFaults "Name and property of the Real Value" textString="R")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Records/Variable_Faults.mo b/FaultTriggering/Utilities/Records/Variable_Faults.mo index f4074a3..e8a59ee 100644 --- a/FaultTriggering/Utilities/Records/Variable_Faults.mo +++ b/FaultTriggering/Utilities/Records/Variable_Faults.mo @@ -85,7 +85,7 @@ record Variable_Faults "Variable Faults" Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/FaultType.mo b/FaultTriggering/Utilities/Types/FaultType.mo index db010d5..4726b69 100644 --- a/FaultTriggering/Utilities/Types/FaultType.mo +++ b/FaultTriggering/Utilities/Types/FaultType.mo @@ -21,7 +21,7 @@ type FaultType = enumeration( textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Fault_SelectBooleanFault.mo b/FaultTriggering/Utilities/Types/Fault_SelectBooleanFault.mo index 77903c1..dd40328 100644 --- a/FaultTriggering/Utilities/Types/Fault_SelectBooleanFault.mo +++ b/FaultTriggering/Utilities/Types/Fault_SelectBooleanFault.mo @@ -8,7 +8,7 @@ type Fault_SelectBooleanFault = textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Fault_SelectIntegerFault.mo b/FaultTriggering/Utilities/Types/Fault_SelectIntegerFault.mo index ae9c947..eb01c78 100644 --- a/FaultTriggering/Utilities/Types/Fault_SelectIntegerFault.mo +++ b/FaultTriggering/Utilities/Types/Fault_SelectIntegerFault.mo @@ -8,7 +8,7 @@ type Fault_SelectIntegerFault = textString="I")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Fault_SelectRealFault.mo b/FaultTriggering/Utilities/Types/Fault_SelectRealFault.mo index 5762459..934ed0a 100644 --- a/FaultTriggering/Utilities/Types/Fault_SelectRealFault.mo +++ b/FaultTriggering/Utilities/Types/Fault_SelectRealFault.mo @@ -8,7 +8,7 @@ type Fault_SelectRealFault = textString="R")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Parameter_Fault_Boolean.mo b/FaultTriggering/Utilities/Types/Parameter_Fault_Boolean.mo index 75028eb..7230618 100644 --- a/FaultTriggering/Utilities/Types/Parameter_Fault_Boolean.mo +++ b/FaultTriggering/Utilities/Types/Parameter_Fault_Boolean.mo @@ -8,7 +8,7 @@ type Parameter_Fault_Boolean = textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Parameter_Fault_Integer.mo b/FaultTriggering/Utilities/Types/Parameter_Fault_Integer.mo index 9e8c9a9..6b27df1 100644 --- a/FaultTriggering/Utilities/Types/Parameter_Fault_Integer.mo +++ b/FaultTriggering/Utilities/Types/Parameter_Fault_Integer.mo @@ -8,7 +8,7 @@ type Parameter_Fault_Integer = textString="I")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Parameter_Fault_Real.mo b/FaultTriggering/Utilities/Types/Parameter_Fault_Real.mo index f6fc221..5251bee 100644 --- a/FaultTriggering/Utilities/Types/Parameter_Fault_Real.mo +++ b/FaultTriggering/Utilities/Types/Parameter_Fault_Real.mo @@ -8,7 +8,7 @@ type Parameter_Fault_Real = textString="R")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Variable_Fault_Boolean.mo b/FaultTriggering/Utilities/Types/Variable_Fault_Boolean.mo index a925e7a..5f1e889 100644 --- a/FaultTriggering/Utilities/Types/Variable_Fault_Boolean.mo +++ b/FaultTriggering/Utilities/Types/Variable_Fault_Boolean.mo @@ -10,7 +10,7 @@ record Variable_Fault_Boolean "External Fault Triggering parameters" textString="B")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Variable_Fault_Integer.mo b/FaultTriggering/Utilities/Types/Variable_Fault_Integer.mo index 963beeb..9647f67 100644 --- a/FaultTriggering/Utilities/Types/Variable_Fault_Integer.mo +++ b/FaultTriggering/Utilities/Types/Variable_Fault_Integer.mo @@ -10,7 +10,7 @@ record Variable_Fault_Integer "External Fault Triggering parameters" textString="I")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/Utilities/Types/Variable_Fault_Real.mo b/FaultTriggering/Utilities/Types/Variable_Fault_Real.mo index 249e1fd..159e8d0 100644 --- a/FaultTriggering/Utilities/Types/Variable_Fault_Real.mo +++ b/FaultTriggering/Utilities/Types/Variable_Fault_Real.mo @@ -10,7 +10,7 @@ record Variable_Fault_Real "External Fault Triggering parameters" textString="R")}), Documentation(revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/createFaultPackage.mo b/FaultTriggering/createFaultPackage.mo index c3b26bc..83d145c 100644 --- a/FaultTriggering/createFaultPackage.mo +++ b/FaultTriggering/createFaultPackage.mo @@ -93,7 +93,7 @@ faultSizes :={size(realFaultNames, 1),size(integerFaultNames, 1),size( ", revisions=" +
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
")); diff --git a/FaultTriggering/libraryinfo.mos b/FaultTriggering/libraryinfo.mos index 49af03b..afb87d2 100644 --- a/FaultTriggering/libraryinfo.mos +++ b/FaultTriggering/libraryinfo.mos @@ -4,10 +4,10 @@ LibraryInfoMenuSeparator( LibraryInfoMenuCommand( category="libraries", - text="FaultTriggering", + text="FaultTriggering 0.6.3", reference="FaultTriggering", - version="0.4.0", + version="0.6.3", isModel=true, - description="FaultTriggering Library 0.2.0 (for Modelica 3.2.1)", + description="FaultTriggering Library 0.6.3 (for Modelica 3.2.1)", ModelicaVersion="3.2.1", pos=1111) diff --git a/FaultTriggering/package.mo b/FaultTriggering/package.mo index a8ded12..41f961f 100644 --- a/FaultTriggering/package.mo +++ b/FaultTriggering/package.mo @@ -11,9 +11,9 @@ package FaultTriggering "Library for Fault Triggering" - annotation (uses(Modelica(version="3.2.1"), ModelManagement(version="1.1.1")), - version="0.6.0", conversion(noneFromVersion="0.5.0"), - versionDate="2014-05-30", + annotation (uses(Modelica(version="3.2.1")), + version="0.6.3", conversion(noneFromVersion="0.5.0"), + versionDate="2015-06-18", preferredView="info", Documentation(info="

The FaultTriggering Library is an open-source Modelica library to aid the user in the modeling of Faults in models. The library is suitable for model developers as well as users of the faulty models. The main features of the library are:

@@ -62,9 +62,13 @@ preferredView="info",

0.5

2014-04-02: Release to Github, Included Licence information and copyrights

+ +

0.6.3

+

2015-18-52: Works from Dymola 2015 and higher. Removed ModelManagement need. 0.6.1 Branch works now under Linux

+






Licensed by the DLR Institute of System Dynamics and Control under the Modelica License 2

-

Copyright © 2014, DLR Institute of System Dynamics and Control

+

Copyright © 2015, DLR Institute of System Dynamics and Control

This Modelica package is free software and the use is completely at your own risk; it can be redistributed and/or modified under the terms of the Modelica License 2. For license conditions (including the disclaimer of warranty) see Modelica.UsersGuide.ModelicaLicense2 or visit https://www.modelica.org/licenses/ModelicaLicense2.

@@ -74,7 +78,7 @@ preferredView="info", ", revisions="
+
© 2012-2015, DLR Institute of System Dynamics and Control
Copyright -
© 2012-2014, DLR Institute of System Dynamics and Control
"), diff --git a/README.md b/README.md index 4d660fb..9d8bffe 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,36 @@ -##FaultTriggering - - -A free Modelica library for trigger faults in Modelica - -## Library description - -The FaultTriggering Library is an open-source Modelica library to aid the user in the modeling of Faults in models. The library is suitable for model developers as well as users of the faulty models. The main features of the library are: -- Standardized fault inputs to aid the development of faulty models -- Automatic fault package generation to help the user to select the faults - -## Current release - -Download [FaultTriggering Library 0.5.0 (2014-04-02)](../../archive/v0.5.0.zip) - -## License - -This Modelica package is free software and the use is completely at your own risk; -it can be redistributed and/or modified under the terms of the [Modelica License 2](https://modelica.org/licenses/ModelicaLicense2). - - -Copyright (C) 2014, **DLR** German Aerospace Center - -## Development and contribution - - -The library was developed by the **DLR** German Aerospace Center contributors: - - • Franciscus van der Linden - -You may report any issues with using the [Issues](../../issues) button. - -Contributions in shape of [Pull Requests](../../pulls) are always welcome. +##FaultTriggering + + +A free Modelica library for trigger faults in Modelica + +## Library description + +The FaultTriggering Library is an open-source Modelica library to aid the user in the modeling of Faults in models. The library is suitable for model developers as well as users of the faulty models. The main features of the library are: +- Standardized fault inputs to aid the development of faulty models +- Automatic fault package generation to help the user to select the faults + +## Current release + +For Dymola up to 2014 FD01 the following version is supported: [FaultTriggering Library 0.5.0 (2014-04-02)](../../archive/v0.5.0.zip) + +For Dymola versions 2015 and higher the following version is recommended: [FaultTriggering Library 0.6.3 (2014-06-02)](../../archive/v0.6.3.zip) + + +## License + +This Modelica package is free software and the use is completely at your own risk; +it can be redistributed and/or modified under the terms of the [Modelica License 2](https://modelica.org/licenses/ModelicaLicense2). + + +Copyright (C) 2015, **DLR** German Aerospace Center + +## Development and contribution + + +The library was developed by the **DLR** German Aerospace Center contributors: + + • Franciscus van der Linden + +You may report any issues with using the [Issues](../../issues) button. + +Contributions in shape of [Pull Requests](../../pulls) are always welcome. \ No newline at end of file