Updated for 2022-02.

install/jupyter/install.bat

@@ -20,7 +20,7 @@
 
 @echo off
 
-set /A SYSML_VERSION="0.20.0"
+set /A SYSML_VERSION="0.21.0"
 
 echo --- Step 1: Testing Conda installation ---
 where conda

install/jupyter/install.sh

@@ -21,7 +21,7 @@
 
 set -e
 
-SYSML_VERSION="0.20.0"
+SYSML_VERSION="0.21.0"
 
 echo "--- Step 1: Testing Conda installation ---"
 command -v conda || (echo "Conda is not installed. Please install Conda and re-run." && return 1)

kerml/src/examples/Mass Roll-up Example/MassRollup_1.kerml

@@ -1,5 +1,5 @@
 package MassRollup_1 {
-	import ScalarFunctions::*;
+	import NumericalFunctions::*;
 
 	class MassedThing {
 		feature mass subsets ISQ::mass;	

kerml/src/examples/Mass Roll-up Example/MassRollup_2.kerml

@@ -1,5 +1,5 @@
 package MassRollup_2 {
-	import ScalarFunctions::*;
+	import NumericalFunctions::*;
 	import ISQ::*;
 
 	class MassedThing {

kerml/src/examples/Simple Tests/Associations.kerml

@@ -0,0 +1,11 @@
+package Associations {	
+	assoc A {
+		end x;
+		end y[1..*];
+	}
+
+	assoc B specializes A {
+		end x1;
+		end y1[0..*] redefines y;
+	}
+}

kerml/src/examples/Simple Tests/Expressions.kerml

@@ -12,7 +12,10 @@ package Expressions {
 
 	b = x > y? x-y: y-x;
 	c = x->collect {in xx; xx + 1}; 
-	d = x->reduce {in s; in t; s + t}->reduce '+';
+	c1 = x.{in xx; xx + 1}; 
+	d = x->select {in xx; xx != null};
+	d1 = x.?{in xx; xx != null};
+	e = x->reduce {in s; in t; s + t}->reduce '+';
 
 	behavior w specializes ControlPerformances::LoopPerformance (inout v: Integer)  {
 		in expr redefines whileTest {v > 3}

sysml.library/Domain Libraries/Geometry/ShapeItems.sysml

@@ -0,0 +1,266 @@
+/**
+ * This package provides a model of items that represent basic geometric shapes. 
+ */
+package ShapeItems {
+	private import ScalarValues::Boolean;
+	private import ISQ::*;
+	private import SI::m;
+	private import Occurrences::WithinBoth;
+	private import Objects::*;
+	private import Items::Item;
+	private import SequenceFunctions::isEmpty;
+
+	/**
+	 * A Line is a Curve that is a straight line of a given length.
+	 */
+	item def Line :> Curve {
+		attribute :>> length;
+		attribute :>> outerSpaceDimension = 1;
+	}
+
+	/**
+	 * A PlanarSurface is a flat Surface with a given area.
+	 */
+	item def PlanarSurface :> Surface {
+		attribute :>> area;
+		attribute :>> outerSpaceDimension = 2;
+	}
+
+	/**
+	 * Shell is the most general Surface shape.
+	 */
+	abstract item def Shell :> Item, StructuredSpaceObject, Surface;
+
+	/**
+	 * Path is the most general Curve shape.
+	 */
+	abstract item def Path :> Item, StructuredSpaceObject, Curve;
+
+	/**
+	 * A Circle is a Path in the shape of a circle of a given radius.
+	 */
+	item def Circle :> Path {
+		attribute radius :>> radius;
+
+		item :>> faces [0];
+		item :>> edges [1] {
+			attribute circumference :>> length = Circle::radius * TrigFunctions::pi;
+			item :>> shape : Item [0];
+			item :>> vertices [0];
+		}
+		item :>> vertices [0];
+	}
+
+	/**
+	 * A Disc is a Shell bounded by a Circle.
+	 */
+	item def Disc :> Shell {
+		attribute radius :>> radius;
+
+		item :>> shape : Circle [1] {
+			attribute :>> radius = Disc::radius;
+		}
+
+		item :>> faces : PlanarSurface [1] {
+			item :>> edges [1]; 
+		}
+		item :>> edges : Circle [1] = shape;
+		item :>> vertices [0];
+
+		connection :WithinBoth connect faces.edges [1] to edges [0..*];
+	}
+
+	/**
+	 * A Sphere is a Shell in the shape of a sphere of a given radius.
+	 */
+	item def Sphere :> Shell {
+		attribute :>> radius;
+
+		item faces : Surface [1] :>> faces;
+		item :>> edges [0];
+		item :>> vertices [0];
+	}
+
+	/**
+	 * A Cone is a Shell in the shape of a right circular code, possibly truncated, with given
+	 * baseRadius, apexRadius and height.
+	 */
+	item def Cone :> Shell {
+		attribute baseRadius :> radius;
+		attribute apexRadius :> radius default 0 [m];
+		attribute :>> height;
+		attribute isTruncated : Boolean [1] = (apexRadius > 0);
+
+		item faces : Surface [2..3] :>> faces;
+		item bf : Disc [1] :> faces;
+		item af : Disc [0..1] :> faces;
+		item cf : Surface [1] :> faces;
+		constraint { (apexRadius == 0) == isEmpty(af) }
+
+		item edges : Circle [1..2] :>> edges;
+		item be [1] :> edges { 
+			attribute :>> radius = baseRadius;
+		}
+		item ae [0..1] :> edges { 
+			attribute :>> radius = apexRadius;
+		}
+		constraint { isEmpty(af) == isEmpty(ae) }
+
+		item vertices : Point [0..1] :>> vertices;
+		constraint { isEmpty(ae) == isEmpty(vertices) }
+
+		/* Faces to edges */
+		connection :WithinBoth connect bf.edges [1] to be [0..*];
+		connection :WithinBoth connect af.edges [1] to ae [0..*];
+		connection :WithinBoth connect cf.edges [1] to be [0..*];
+		connection :WithinBoth connect cf.edges [1] to ae [0..*];
+
+		/* Faces to vertices */
+		connection :WithinBoth connect cf.vertices [1] to vertices [0..*];
+
+		/* Coincident edges */
+		connection :WithinBoth connect be [2] to be [2];
+		connection :WithinBoth connect ae [2] to ae [2];
+
+	}
+
+	/**
+	 * A Cylinder is a Cone whose baseRadius and apexRadius are the same, representing
+	 * a right circular cylinder.
+	 */
+	item def Cylinder :> Cone {
+		attribute :>> radius = baseRadius;
+
+		attribute :>> baseRadius = apexRadius;
+	}
+
+	/**
+	 * A Cuboid is a Shell in the shape of a six-sided polyhedron with rectangular sides, with
+	 * given length, width and height.
+	 */
+	item def Cuboid :> Shell {
+		attribute :>> length;
+		attribute :>> width;
+		attribute :>> height;
+
+		item faces : PlanarSurface [6] :>> faces {
+			item :>> edges [4]; 
+		}
+		item tf :> faces [1];
+		item bf :> faces [1];
+		item ff :> faces [1];
+		item rf :> faces [1];
+		item slf :> faces [1];
+		item srf :> faces [1];
+
+		item edges : Line [12] :>> edges {
+			item :>> vertices [2]; 
+		}
+		item tfe [2]  :> edges { attribute :>> length = Cuboid::length; }
+		item tre [2]  :> edges { attribute :>> length = Cuboid::length; }
+		item tsle [2] :> edges { attribute :>> length = Cuboid::width; }
+		item tsre [2] :> edges { attribute :>> length = Cuboid::width; }
+		item bfe [2]  :> edges { attribute :>> length = Cuboid::length; }
+		item bre [2]  :> edges { attribute :>> length = Cuboid::length; }
+		item bsle [2] :> edges { attribute :>> length = Cuboid::width; }
+		item bsre [2] :> edges { attribute :>> length = Cuboid::width; }
+		item ufle [2] :> edges { attribute :>> length = Cuboid::height; }
+		item ufre [2] :> edges { attribute :>> length = Cuboid::height; }
+		item urle [2] :> edges { attribute :>> length = Cuboid::height; }
+		item urre [2] :> edges { attribute :>> length = Cuboid::height; }
+
+		item vertices : Point [8] :>> vertices;
+		item tflv [3] :> vertices;
+		item tfrv [3] :> vertices;
+		item trlv [3] :> vertices;
+		item trrv [3] :> vertices;
+		item bflv [3] :> vertices;
+		item bfrv [3] :> vertices;
+		item brlv [3] :> vertices;
+		item brrv [3] :> vertices;
+
+		/* Faces to edges */
+		connection :WithinBoth connect tf.edges [1] to tfe [0..*];
+		connection :WithinBoth connect tf.edges [1] to tre [0..*];
+		connection :WithinBoth connect tf.edges [1] to tsle [0..*];
+		connection :WithinBoth connect tf.edges [1] to tsre [0..*];
+
+		connection :WithinBoth connect bf.edges [1] to bfe [0..*];
+		connection :WithinBoth connect bf.edges [1] to bre [0..*];
+		connection :WithinBoth connect bf.edges [1] to bsle [0..*];
+		connection :WithinBoth connect bf.edges [1] to bsre [0..*];
+
+		connection :WithinBoth connect ff.edges [1] to tfe [0..*];
+		connection :WithinBoth connect ff.edges [1] to bfe [0..*];
+		connection :WithinBoth connect ff.edges [1] to ufle [0..*];
+		connection :WithinBoth connect ff.edges [1] to ufre [0..*];
+
+		connection :WithinBoth connect rf.edges [1] to tre [0..*];
+		connection :WithinBoth connect rf.edges [1] to bre [0..*];
+		connection :WithinBoth connect rf.edges [1] to urle [0..*];
+		connection :WithinBoth connect rf.edges [1] to urre [0..*];
+
+		connection :WithinBoth connect slf.edges [1] to tsle [0..*];
+		connection :WithinBoth connect slf.edges [1] to bsle [0..*];
+		connection :WithinBoth connect slf.edges [1] to ufle [0..*];
+		connection :WithinBoth connect slf.edges [1] to urle [0..*];
+
+		connection :WithinBoth connect srf.edges [1] to tsre [0..*];
+		connection :WithinBoth connect srf.edges [1] to bsre [0..*];
+		connection :WithinBoth connect srf.edges [1] to ufre [0..*];
+		connection :WithinBoth connect srf.edges [1] to urre [0..*];
+
+		/* Edges to vertices */
+		connection :WithinBoth connect tfe.vertices [1] to tflv [0..*];
+		connection :WithinBoth connect tfe.vertices [1] to tfrv [0..*];
+		connection :WithinBoth connect tre.vertices [1] to trlv [0..*];
+		connection :WithinBoth connect tre.vertices [1] to trrv [0..*];
+		connection :WithinBoth connect tsle.vertices [1] to tflv [0..*];
+		connection :WithinBoth connect tsle.vertices [1] to trlv [0..*];
+		connection :WithinBoth connect tsre.vertices [1] to tfrv [0..*];
+		connection :WithinBoth connect tsre.vertices [1] to trrv [0..*];
+
+		connection :WithinBoth connect bfe.vertices [1] to bflv [0..*];
+		connection :WithinBoth connect bfe.vertices [1] to bfrv [0..*];
+		connection :WithinBoth connect bre.vertices [1] to brlv [0..*];
+		connection :WithinBoth connect bre.vertices [1] to brrv [0..*];
+		connection :WithinBoth connect bsle.vertices [1] to bflv [0..*];
+		connection :WithinBoth connect bsle.vertices [1] to brlv [0..*];
+		connection :WithinBoth connect bsre.vertices [1] to bfrv [0..*];
+		connection :WithinBoth connect bsre.vertices [1] to brrv [0..*];
+
+		connection :WithinBoth connect ufle.vertices [1] to tflv [0..*];
+		connection :WithinBoth connect ufle.vertices [1] to bflv [0..*];
+		connection :WithinBoth connect ufre.vertices [1] to tfrv [0..*];
+		connection :WithinBoth connect ufre.vertices [1] to bfrv [0..*];
+		connection :WithinBoth connect urle.vertices [1] to trlv [0..*];
+		connection :WithinBoth connect urle.vertices [1] to brlv [0..*];
+		connection :WithinBoth connect urre.vertices [1] to trrv [0..*];
+		connection :WithinBoth connect urre.vertices [1] to brrv [0..*];
+
+		/* Coincident edges */
+		connection :WithinBoth connect tfe [2] to tfe [2];
+		connection :WithinBoth connect tre [2] to tre [2];
+		connection :WithinBoth connect tsle [2] to tsle [2];
+		connection :WithinBoth connect tsre [2] to tsre [2];
+		connection :WithinBoth connect bfe [2] to bfe [2];
+		connection :WithinBoth connect bre [2] to bre [2];
+		connection :WithinBoth connect bsle [2] to bsle [2];
+		connection :WithinBoth connect bsre [2] to bsre [2];
+		connection :WithinBoth connect ufle [2] to ufle [2];
+		connection :WithinBoth connect ufre [2] to ufre [2];
+		connection :WithinBoth connect urle [2] to urle [2];
+		connection :WithinBoth connect urre [2] to urre [2];
+
+		/* Coincident vertices */
+		connection :WithinBoth connect tflv [3] to tflv [3];
+		connection :WithinBoth connect tfrv [3] to tfrv [3];
+		connection :WithinBoth connect trlv [3] to trlv [3];
+		connection :WithinBoth connect trrv [3] to trrv [3];
+		connection :WithinBoth connect bflv [3] to bflv [3];
+		connection :WithinBoth connect bfrv [3] to bfrv [3];
+		connection :WithinBoth connect brlv [3] to brlv [3];
+		connection :WithinBoth connect brrv [3] to brrv [3];
+	}
+	alias Box for Cuboid;
+}