Merge pull request #46 from rakhimov/minor-fixes

Minor fixes

Author: cfolleau

.travis.yml

@@ -36,7 +36,6 @@ script:
     - docker run mef/make
     - docker cp $(docker ps -alq):mef/build ./
 
-after_script:
     - trang mef/schema/mef.rnc _check_mef.rng
     - trang mef/schema/mef.rnc _check_mef.xsd
     - xmllint --noout --relaxng _check_mef.rng mef-examples/Baobab/*.xml

README.rst

@@ -94,7 +94,7 @@ RNC schema of the fault tree specification:
         Fault tree diagram
 
 
-    .. table:: The fault tree specifiction
+    .. table:: The fault tree specification
         :name: table_fault_tree
 
         +-------+------+

conf.py

@@ -225,7 +225,7 @@ def open(filename):
 
 # If true, links to the reST sources are added to the pages.
 #
-# html_show_sourcelink = True
+html_show_sourcelink = False
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
 #

mef/fault_tree_layer.rst

@@ -147,8 +147,8 @@ This description deserves some comments.
   it is often convenient to use variables in formulae before declaring them.
   The Model Exchange Format, therefore, refers to variables with the generic term "event",
   possibly without a "type" attribute.
-- By default, the value of a house is event is "false".
-  So it is not necessary to associate a value with a house event when declaring it.
+- By default, the value of a house is event is "false",
+  so it is not necessary to associate a value with a house event when declaring it.
   We shall see in :numref:`instructions` how to change the value of a house event.
 - Although events are typed (they are either gates, house events or basic events),
   two different events cannot have the same name (within the same name space),
@@ -169,7 +169,7 @@ The attribute "role" is used to declare whether an element is public or private,
 i.e., whether it can be referred by its name everywhere in the model
 or only within its inner most container.
 This point will be further explained in the next section.
-This attribute is optional for by default all elements are public.
+This attribute is optional, for by default, all elements are public.
 
 The fault tree pictured in :numref:`fig_fault_tree` is described in :numref:`xml_fault_tree`.
 In this representation, the house event "h1" has by default the value "true".

mef/meta_logical_layer.rst

@@ -4,7 +4,7 @@
 Meta-Logical Layer
 ******************
 
-The meta-logical layer is populated constructs
+The meta-logical layer is populated with constructs
 like common cause groups, delete terms, recovery rules,
 and exchange events that are used to give flavors to fault trees.
 This chapter reviews all these constructs.

mef/schema/expressions.rnc

@@ -42,5 +42,5 @@ int =
 
 float =
   element float {
-    attribute value { xsd:float }
+    attribute value { xsd:double }
   }

mef/schema/formula.rnc

@@ -9,7 +9,7 @@ formula =
   | element nand { formula+ }
   | element nor { formula+ }
   | element atleast {
-      attribute min { xsd:nonNegativeInteger },
+      attribute min { xsd:positiveInteger },
       formula+
     }
   | element cardinality {

mef/schema/mission_phase.rnc

@@ -6,7 +6,7 @@ alignment-definition =
 phase-definition =
   element define-phase {
     name,
-    attribute time-fraction { xsd:float },
+    attribute time-fraction { xsd:double },
     label?,
     attributes?,
     instruction*

mef/schema/model.rnc

@@ -14,5 +14,5 @@ model =
      | fault-tree-definition
      | substitution-definition
      | CCF-group-definition
-     | include-directive)*,
+     | include-directive)*
   }

mef/schema/statistical_measure.rnc

@@ -28,14 +28,14 @@ statistical-measure =
 
 quantiles =
   element quantiles {
-    attribute number { xsd:nonNegativeInteger },
+    attribute number { xsd:positiveInteger },
     quantile+
   }
 
 quantile = element quantile { bin-data }
 
 bin-data =
-  attribute number { xsd:nonNegativeInteger },
+  attribute number { xsd:positiveInteger },
   attribute mean { xsd:double }?,
   attribute lower-bound { xsd:double }?,
   attribute upper-bound { xsd:double }?