Merge branch 'master' into 'Keane_Branch'

# Conflicts:
#   Example01_SimpleMessageFlow_EventCoordination.mp
#   Example01a_UnreliableMessageFlow_VirtualEvents.mp
#   Example02_DataFlow_EventSharing.mp
#   Example03_ATMWithdrawal_BehaviorOfEnvironment.mp
#   Example06_UnreliableChannel_AssertionChecking.mp
#   Example09_PipeFilter_TraceAnnotationQueries.mp
#   Example12_CardiacArrestWorkflow_VirtualEvents.mp
#   Example15_BackpackWeight_IntervalAttributes.mp
#   Example18_RedGreen_BayesianProbabilityCalculationsType2.mp
#   Example21_DataFlow_LocalReport.mp
#   Example22_SimpleMessageFlow_GlobalReport.mp
#   Example24_Compiler_ComponentDiagram.mp
#   Example25_Graph_as_Data_Structure.mp
#   Example26_UnreliableMessageFlow_GlobalQuery.mp
#   Example28_AssemblingStatistics_Histogram.mp
#   Example29_AssemblingStatistics_Gantt_Chart.mp
#   Example30_MicrowaveOven_ModelingModelChecking.mp
#   Example33_ATMWithdrawal_StatechartView.mp
#   Example35_FiniteStateDiagram_PathDiagram.mp
#   Example36_Authentication_SystemReuse.mp

Application_examples/Surgery.mp

-/* Surgery example 
+/* Model of [Surgery]
+
+Surgery example 
 This model shows an example of decisions made by a leader (Physician),
 a subordinate(s) (Nurse(s)), and the Environment as applied in a surgery
 setting.
@@ -8,7 +10,8 @@ Available at https://ieeexplore.ieee.org/abstract/document/7994952
 
 Created by: J. Quartuccio (2017)
 Naval Postgraduate School
-*/
+
+==========================================================*/
 
 /*Actors*/
 SCHEMA Surgery
@@ -83,4 +86,4 @@ ENSURE (#Correct_decision FROM Physician == 1 ->
 #Successful_outcome FROM Environment
 ==1);
 ENSURE (#Incorrect_decision FROM Physician == 1 ->
-#Failed_outcome FROM Environment ==1);
\ No newline at end of file
+#Failed_outcome FROM Environment ==1);

Application_examples/Swarm_Search_and_Track.mp

-/*
+/* Model of [Swarm_Search_and_Track]
+
 Michael Revill
 22 February 2016
 Incorporating Failure Modes and Failsafe Behaviors
@@ -14,7 +15,7 @@ Verb-oriented events in title case are states
 This model demonstrates the found unexpected behavior for 
 object discovery after bingo fuel (trace 6)
 
-*/
+==========================================================*/
 
 SCHEMA Swarm_Search_and_Track
 

Application_examples/Swarm_UAV.mp

-/*
+/* Model of [Swarm_UAV]
+
  	Kristin Giammarco and Mikhail Auguston
   MP Model based on "Swarm CONOPs" Draft 11 February 2015 
 	11 February 2015 - Initial Model Started by KGiammarco
@@ -9,7 +10,8 @@
 	This model demonstrates how to get several instances of the same actor (UAV) 
     coordinated with external events (run for scopes 2 and 3 to see 2 and 3 UAVs, 
     respectively).
-*/
+
+==========================================================*/
 
 SCHEMA Swarm_UAV
 

Application_examples/Turtles_in_the_Desert.mp

-/* Example39    turtles.mp
+/* Model of [Turtles_in_the_Desert]
+
+Example39    turtles.mp
  
  Demonstration of the benefits for complete
  example set generation in MP.
@@ -24,7 +26,8 @@ Don't try to construct a non-Euclidean geometry to
  There are 13 possible scenarios, and none when all three 
  are telling the truth.
  
- ==================================*/
+==========================================================*/
+
 SCHEMA Turtles
 
 neighbors: { (nobody_before  | one_before  | two_before ),

Application_examples/UAV_Ingress.mp

-/*******************************************************************
+/* Model of [UAV_Ingress]
 
 UAV HADR Mission
 
@@ -11,8 +11,7 @@ is acceptable but the operator aborts the ingress (trace 2).
   
   created by A. Constable May 2017
   
-********************************************************************/
-
+==========================================================*/
 
 SCHEMA UAV_Ingress
 

Application_examples/UAV_OnStation.mp

-/*********************************************************************************************
+/* Model of [UAV_OnStation]
 
 A Model for an Unmanned Aerial Vehicle in the OnStation Phase of an ISR Mission
   
@@ -14,8 +14,7 @@ Paper available at https://ieeexplore.ieee.org/abstract/document/7994950
   modified by K.Giammarco on 02-05-2017 to add normal events back to failure mode scenarios 
   										and added annotations
   
-*********************************************************************************************/
-
+==========================================================*/
 
 SCHEMA UAV_OnStation
 

Application_examples/Unmanned_Spacecraft_Comms.mp

-/* Heartbeat.mp
+/* Model of [Unmanned_Spacecraft_Comms]
+
+Heartbeat.mp
 October 4, 2015
 Created by: C. Nelson
 	
@@ -9,7 +11,7 @@ the ISS.
 
 Run for scope 1 and up. 
  
-*/
+==========================================================*/
 
 /*—————————————————————————————
  	 		  Actors

Application_examples/Web_Browser_Formal_Security.mp

-/* Example 40. MP Web browsers formal security model.
+/* Model of [Web_Browser_Formal_Security]
+
+Example 40. MP Web browsers formal security model.
    
 based on the papers by: 
 
@@ -36,7 +38,8 @@ in order to model the vulnerabilities explained in the papers above.
     how MP can check whether Client's web query may 
 	be indirectly affected by Bad Server's Redirect intervention.
     
-==============================================================================*/
+==========================================================*/
+
 SCHEMA Web_browser
 
 /* Response may embed some Request events,

Application_examples/Wide_Range_Search_for_Wreckage_and_Survivors

-/* Example8_OperationalProcess.mp
+/* Model of [Wide_Range_Search_for_Wreckage_and_Survivors]
+
+Example8_OperationalProcess.mp
 	modeling operational processes
 	
 Operational processes can be modeled to provide a common baseline against which 
@@ -24,8 +26,7 @@ added to this model yet.
 The "Sequence" or "Swim Lanes" layouts are the most appropriate for browsing traces here. 
 The "Sequence" mode yields views very similar to the UML or SysML Sequence Diagrams. 
 
-*/
-
+==========================================================*/
 
 /* Actors */
 

Application_examples/Work_Productivity.mp

-/* Example 26, timing attribute use
+/* Model of [Work_Productivity]
+
+Example 26, timing attribute use
 
 	also demonstrates how to print all 
 	events present in the trace 
 	with timing attributes
 
     run for scopes 1 and up
-*/
+
+==========================================================*/
+
 SCHEMA Delays
 
 Work:

Example01_SimpleMessageFlow_EventCoordination.mp

-/* 
-Example1_simple_message_flow.mp
+/* Example 01. Model of [Simple_Message_Flow]
 	 
 Event grammar rules for each root define derivations for event traces,
 in this case a simple sequence of zero or more events for each root.
@@ -12,7 +11,7 @@ The coordination operation behaves as a "cross-cutting" derivation rule.
 Run for scopes 1 and up. The "Sequence" or "Swim Lanes" layouts are 
 the most appropriate for browsing traces here.
 
-*/
+==========================================================*/
 
 SCHEMA Simple_Message_Flow
 

Example01a_UnreliableMessageFlow_VirtualEvents.mp

-/* Example 1a
-Unreliable message flow.
+/* Example 01a. Model of [Unreliable_Message_Flow]
 
 We may want to specify behaviors when some messages get lost in the transition. 
 It can be done using ‘virtual’ events.
 
 run for scopes 1 and up.
 
-*/
-SCHEMA Unreliable_Message_Flow
+==========================================================*/
+
+SCHEMA unreliable_message_flow
 ROOT 	Sender: 	(* send *);
 ROOT 	Receiver: 	(* (receive | does_not_receive) *);
 

Example02_DataFlow_EventSharing.mp

-/* Example2_DataAsEvents.mp
-	data items as behaviors
+/* Example 02. Model of [Data_Flow]
+	
+data items as behaviors
 
 MP employs the Abstract Data Type (ADT) principle introduced by 
 Barbara Liskov to represent data items as operations
@@ -22,7 +23,7 @@ This is a toy example of System_of_Systems emerging behavior modeling.
 Run for scopes 1 and up. The "Sequence" or "Swim Lanes" layouts are 
 the most appropriate for browsing traces here. 
 
-*/
+==========================================================*/
 
 SCHEMA Data_Flow
 

Example03_ATMWithdrawal_BehaviorOfEnvironment.mp

-/* Example3_ATM_withdrawal.mp
-	Integrated system and environment behaviors
+/* Example 03. Model of [ATM_Withdrawal]
+	
+Integrated system and environment behaviors
 	
 MP separates models of component behaviors and component interactions 
 to permit elaboration on behaviors of multiple interacting actors.
@@ -25,7 +26,7 @@ By selecting a representative enough trace (containing all events and interactio
 like traces 2 or 3 for scope 1), and then collapsing root event, it becomes possible 
 to view a traditional "box-and-arrow" architecture diagram, i.e. to visualize an architecture view.
 
-*/
+==========================================================*/
 
 SCHEMA ATM_Withdrawal
 

Example04b_QueueBehavior_UserDefinedRelations.mp

-/* Example4_Stack_behavior.mp 
+/* Example 04b. Model of [Queue_Behavior]
 
 The event trace is a set of events and the Boolean expression constructs in MP 
 can support the traditional first order predicate calculus notation. 
@@ -8,9 +8,8 @@ grammar rules, composition operations, and some additional constraints –
 ENSURE conditions.
 
 run for scopes 1, 2, 3, and up.
-*/
 
-/* This rule specifies the behavior of a stack in terms of stack operations 
+This rule specifies the behavior of a stack in terms of stack operations 
 push and pop. It is assumed that initially Stack is empty. 
 The BUILD block associated with a root or composite event 
 contains composition operations performed when event trace segment 
@@ -27,7 +26,8 @@ that satisfy the constraint. This example presents a filtering operation
 as yet another kind of behavior composition, and demonstrates an
 example of combining imperative (event grammar) and declarative 
 (Boolean expressions) constructs for behavior specification.
-*/
+
+==========================================================*/
 
 SCHEMA Stack_Behavior
 

Example05_CarRace_NestedComposition.mp

-/* Example5_CarRace.mp
+/* Example 05. Model of [Car_Race]
 
-	more coordination patterns:
-	-	ordering of selected events in concurrent threads
-		can be modeled by coordinating them with event sequence;
-        
-	-	one-many coordination.
+more coordination patterns:
+-	ordering of selected events in concurrent threads
+	can be modeled by coordinating them with event sequence;
+	
+-	one-many coordination.
     
-	Run for scopes 1 and up. The "Sequence" or "Swim Lanes" 
-	layouts are the most appropriate for browsing traces here. 
-*/
+Run for scopes 1 and up. The "Sequence" or "Swim Lanes" 
+layouts are the most appropriate for browsing traces here. 
+
+==========================================================*/
 
 SCHEMA Car_Race
 

Example06_UnreliableChannel_AssertionChecking.mp

-/* Example6 Assertion checking, Communicating via unreliable channel.
+/* Example 06. Model of [Unreliable_Channel]
+
+	Assertion checking, Communicating via unreliable channel.
 
 	MP models need to be tested and debugged like any other 
     programming artifacts. Trace generation for a given scope 
@@ -17,7 +19,8 @@
     This can significantly speed up the testing process. Of course, 
     if the property should always hold, it makes sense to convert it 
     into the ENSURE condition.
-*/
+
+==========================================================*/
 
 SCHEMA Unreliable_Channel
 

Example07_UnconstrainedStack_TraceAnnotation.mp

-/* Example7 	Trace annotation techniques 
+/* Example 07. Model of [Unconstrained_Stack]
+
+Trace annotation techniques 
 
 Assertion checking with the CHECK clause may be the simplest and most
 common tool for finding counterexamples of traces, which violate some
@@ -14,7 +16,8 @@ unwanted behaviors. The MP code illustrates how to pinpoint events that
 might  violate certain property, and how to annotate these particular 
 events in the trace with additional messages. Programmers will recognize 
 the use of debugging print statements for traditional program testing/debugging.
-*/
+
+==========================================================*/
 
 SCHEMA Unconstrained_Stack
 ROOT Stack: (*  ( push | pop [ bang ])  *)

Example08_EmployeeEmployer_CoordinationAcrossHierarchyLevels.mp

-/* Example9_Employee_Employer.mp
+/* Example 08. Model of [Employee_Employer]
 
 The web site http://www.infoq.com/articles/bpelbpm 
 “Why BPEL is not the holy grail for BPM “ 
@@ -23,7 +23,8 @@ parallel workflow [in BPEL] that is equivalent to this one ..."
 	Run for scope 1. The "Sequence" or "Swim Lanes" 
 	layouts are the most appropriate for browsing traces here.
 	Some box reshuffling may be needed to improve the trace layout. 
-*/
+
+==========================================================*/
 
 SCHEMA Employee_Employer
 

Example09_PipeFilter_TraceAnnotationQueries.mp

-/*  Example10_Pipe_Filter.mp 
+/*  Example 09. Model of [Pipe_Filter]
+    
     pipe/filter architecture model with 2 filters
 
     assumptions: 
@@ -6,7 +7,8 @@
         2) after a message has been sent, it cannot be send repeatedly,
         3) received message can stay in the Filter for while, 
         	before being sent (if at all).
-*/
+
+==========================================================*/
 
 SCHEMA Pipe_Filter