From c577b9a1d0c020271111659d186f199ff98a7f0c Mon Sep 17 00:00:00 2001 From: Lennart Ochel Date: Fri, 13 Mar 2015 12:58:07 +0100 Subject: [PATCH] Fix references to images --- PNlib/Models/Senseo/package.mo | 6 +++--- PNlib/UserGuide.mo | 30 +++++++++++++++--------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/PNlib/Models/Senseo/package.mo b/PNlib/Models/Senseo/package.mo index e99450b8..2f1ae97d 100644 --- a/PNlib/Models/Senseo/package.mo +++ b/PNlib/Models/Senseo/package.mo @@ -118,7 +118,7 @@ Additionally, the head of the stickman is green when the machine is on and red w he when water is refilled the respective rectangle is blue.

- +

The xHPN model ans the corresponding processes listed in the table are divided for the Modelica model into five sub-models, also called wrappers, which represent the following processes: @@ -134,7 +134,7 @@ The xHPN model ans the corresponding processes listed in the table are divided f These xHPN-sub-model are represented in following figure.

- +

The following figure shows one possible result for simulating the Senseo machine 5 hours. @@ -142,7 +142,7 @@ It has to mentioned that every simulation result is different due to the include choosing one or two coffees, stopping the machine or producing another coffee).

- +

")); end Senseo; diff --git a/PNlib/UserGuide.mo b/PNlib/UserGuide.mo index dae5b27a..11bac450 100644 --- a/PNlib/UserGuide.mo +++ b/PNlib/UserGuide.mo @@ -9,7 +9,7 @@ two different states, called places: discrete and continuous places, and in the following figure.

-

+

Discrete places contain an integer quantity, called tokens or marks while continuous places contain a non-negative real quantity. @@ -44,7 +44,7 @@ However, T2 is not active because the marking of P5 is less than the arc weight greater than the weight of the inhibitor arc (m(P8)=3>f(P8→T3)=2). However, T4 is active because the marking of P11 is less than the arc weight (m(P11)=1<f(P11→T4)=2).

-

+

The conversion of a discrete to a continuous marking is realized by connecting a discrete transition to a continuous place and the conversion from a continuous to a discrete marking is @@ -60,7 +60,7 @@ when continuous transitions fire but their marking cannot be changed during the

  • T4 fires by removing 0.8 marks from P9 and adding one mark to P10.
    • -

    +

    It is important to mention that a discrete transition fires always in a discrete manner by removing and adding marks after a delay is passed regardless of whether a @@ -99,7 +99,7 @@ P1 enables T2. T2 is firable and fires by removing two tokens from P1 and adding If the enabling is performed at random, one of the transitions is enabled according to their assigned probabilities, e.g. T1 has the probability 0.7 and T2 has the probability 0.3.

    -

    +

    Type-2-Conflict

    Another conflict can occur between a continuous place and two or more continuous transitions when the input speed is not sufficient to fire all output transitions with the instantaneous speed @@ -110,7 +110,7 @@ If the enabling is performed at random, one of the transitions is enabled accord The left Petri net has no actual conflict but P2 and P3 of the right Petri net have an actual conflict. Their input speed is not sufficient to fire T5 and T6 with the respective speed.

    -

    +

    Type-3-Conflict

    @@ -128,7 +128,7 @@ If m(P4)<f(P4→T5) or m(P4)>f(P4→T5), there is no conflict. It is so This rule is intuitively logical because the firing of a continuous transition is a continuous flow and the firing of a discrete transition is an extreme change of the Petri net marking.

    -

    +

    Type-4-Conflict

    @@ -141,7 +141,7 @@ This conflict can be solved by prioritization of the transitions. If T1 takes pr T2 becomes active and fires. Therefore, all continuous output transitions of a discrete place have to be provided with priorities.

    -

    +

    PNlib: A Modelica Library for Modeling xHPN

    IMPORTANT:

    @@ -200,7 +200,7 @@ dashed arc, the inhibitor arc by an arc with a white circle at its end, and the with a black square at its end.

    -

    +

    Connectors

    The PNlib contains four different connectors: PlaceOut, PlaceIn, TransitionOut, and TransitionIn. @@ -208,7 +208,7 @@ The connectors PlaceOut and PlaceIn are part of place models and connect them to Similar, TransitionOut and TransitionIn are connectors of the transition model and connect them to output and input places, respectively. The figure shows which connector belongs to with Petri net component model.

    -

    +

    The connectors of the Petri net component models are vectors to enable the connection to an arbitrary number of input and output components. Therefore, the dimension parameters nIn and nOut are declared in the place and transition models with the connectorSizing annotation.

    @@ -301,7 +301,7 @@ connect(P1.outTransition[3], T3.inPlaces[1]); The enabling probabilities 0.3 for T1, 0.25 for T2, and 0.45 for T3 have to be entered by the parameter vector enablingProbOut={0.3,0.25,0.45}.

    -

    +

    Implementation

    The main process in the place model is the recalculation of the marking after firing @@ -424,7 +424,7 @@ firingCon = time>9.7 causes that the transition cannot be activated as long as time is less than 9.7.

    -

    +

    Example: Input of maximum speed functions

    @@ -441,7 +441,7 @@ whereby P1.t and P2.t accesses the marks of P1 and P2, respectively. Transition maximumSpeed = if time≤6.5 then 2.6 else 1.7.

    -

    +

    Implementation

    @@ -459,7 +459,7 @@ to arcs that are generated by connect equations. Due to that fact, the test, inh and transitions (see figure); the normal arc is simply generated by the connect equation. Test and inhibitor arc can be normal arcs simultaneously.

    -

    +

    Parameters of test and inhibitor arcs (read arcs have no parameters) @@ -498,7 +498,7 @@ The animation toolbar allows the control of the animation. An animation offers a The figure shows four selected points in time of the animation of an xHPN example.

    -

    +

    All display and animation options are realized with the DynamicSelect annotation. @@ -514,7 +514,7 @@ at the top of the place icon. In the case of discrete places it is an orange Int it is a blue RealOutput connector. In the figure above the markings of P1, P3, P5, and P6 are available in Matlab.

    -

    +

    ")); end UserGuide;