From e5a44589d4562e7df22109644054adee7d65e1a4 Mon Sep 17 00:00:00 2001
From: Anders Nilsson <anders.nilsson@cs.lth.se>
Date: Sun, 3 Dec 2006 19:39:55 +0100
Subject: [PATCH] Synching

---
 CompilerGeneration.jrag      |    9 +
 owl.ast                      |    2 +-
 siaras/GeneratedAspects.jrag | 2141 ++++++++++++----------------------
 3 files changed, 738 insertions(+), 1414 deletions(-)

diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index 676603d..b3fa0ad 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -130,6 +130,11 @@ aspect GenPrettyPrinter {
 		pStream.println("      getChild(i).prettyPrint(indent,pStream);");
 		pStream.println("    }");
 		pStream.println("  }\n");
+		pStream.println("  public void Start.prettyPrint(String indent, PrintStream pStream) {");
+		pStream.println("    for (int i=0; i<getNumElement(); i++) {");
+		pStream.println("      getElement(i).prettyPrint(indent,pStream);");
+		pStream.println("    }");
+		pStream.println("  }\n");
 		super.genPrettyPrinter(ind,pStream);
 		pStream.println("}\n");
 	}
@@ -143,6 +148,10 @@ aspect GenPrettyPrinter {
 // 		}
 		pStream.println(">\");");
 		pStream.println("    String childIndent = indent + \"  \";");
+		Restrictions restr = getRestrictions();
+		for (int i=0; i<restr.getNumRestriction(); i++) {
+
+		}
 		pStream.println("    for (int i=0; i<getNumElement(); i++) {");
 		pStream.println("      getElement(i).prettyPrint(childIndent,pStream);");
 		pStream.println("    }");
diff --git a/owl.ast b/owl.ast
index c228d97..f1a604a 100644
--- a/owl.ast
+++ b/owl.ast
@@ -82,6 +82,6 @@ abstract OwlValuesFrom: ComplexElement;
 
 
 Properties ::= Property:Element*;
-//Restrictions ::= OwlRestriction*;
+Restrictions ::= OwlRestriction*;
 
 abstract OwlProperty : ComplexElement;
diff --git a/siaras/GeneratedAspects.jrag b/siaras/GeneratedAspects.jrag
index 9429268..365bcc4 100644
--- a/siaras/GeneratedAspects.jrag
+++ b/siaras/GeneratedAspects.jrag
@@ -13,18 +13,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -201,31 +201,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureTemperature") && !(this instanceof Thing))
-      to MeasureTemperature {
-      MeasureTemperature node = new MeasureTemperature();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("DetectColor") && !(this instanceof Thing))
       to DetectColor {
@@ -286,18 +261,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -341,31 +316,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureOrientationOfObject") && !(this instanceof Thing))
-      to MeasureOrientationOfObject {
-      MeasureOrientationOfObject node = new MeasureOrientationOfObject();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("ManufacturingFunction") && !(this instanceof Thing))
       to ManufacturingFunction {
@@ -444,18 +394,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -468,44 +418,19 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
       node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("CheckPresence") && !(this instanceof Thing))
-      to CheckPresence {
-      CheckPresence node = new CheckPresence();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setSensorList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -570,6 +495,17 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("MaximumForce") && !(this instanceof Thing))
+      to MaximumForce {
+      MaximumForce node = new MaximumForce();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("SmartCamera") && !(this instanceof Thing))
       to SmartCamera {
@@ -580,18 +516,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -638,6 +574,56 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("OpticDistanceSensorScanner") && !(this instanceof Thing))
+      to OpticDistanceSensorScanner {
+      OpticDistanceSensorScanner node = new OpticDistanceSensorScanner();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Property) {
+          l.add(getElement(i));
+        }
+      }
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
+      return node;
+    }
+  }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("Determine") && !(this instanceof Thing))
+      to Determine {
+      Determine node = new Determine();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("CoordinateReferenceSystem") && !(this instanceof Thing))
       to CoordinateReferenceSystem {
@@ -659,18 +645,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -735,31 +721,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("LaserScanner2D") && !(this instanceof Thing))
-      to LaserScanner2D {
-      LaserScanner2D node = new LaserScanner2D();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Store") && !(this instanceof Thing))
       to Store {
@@ -839,31 +800,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureSpeed") && !(this instanceof Thing))
-      to MeasureSpeed {
-      MeasureSpeed node = new MeasureSpeed();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Pan") && !(this instanceof Thing))
       to Pan {
@@ -943,31 +879,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureTorque") && !(this instanceof Thing))
-      to MeasureTorque {
-      MeasureTorque node = new MeasureTorque();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("FingerGripper") && !(this instanceof Thing))
       to FingerGripper {
@@ -978,18 +889,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -1186,52 +1097,27 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("WheelEncoder") && !(this instanceof Thing))
-      to WheelEncoder {
-      WheelEncoder node = new WheelEncoder();
+    when (getOwlIdentifier().getIDENTIFIER().equals("CycleTime") && !(this instanceof Thing))
+      to CycleTime {
+      CycleTime node = new CycleTime();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      return node;
+    }
+  }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("Weld") && !(this instanceof Thing))
+      to Weld {
+      Weld node = new Weld();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("CycleTime") && !(this instanceof Thing))
-      to CycleTime {
-      CycleTime node = new CycleTime();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Weld") && !(this instanceof Thing))
-      to Weld {
-      Weld node = new Weld();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
@@ -1250,31 +1136,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("DetectCollision") && !(this instanceof Thing))
-      to DetectCollision {
-      DetectCollision node = new DetectCollision();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Accuracy") && !(this instanceof Thing))
       to Accuracy {
@@ -1362,31 +1223,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("OpticSwitch") && !(this instanceof Thing))
-      to OpticSwitch {
-      OpticSwitch node = new OpticSwitch();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("AdjustVacuumToGrip") && !(this instanceof Thing))
       to AdjustVacuumToGrip {
@@ -1416,6 +1252,31 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("CompressDecompressImageData") && !(this instanceof Thing))
+      to CompressDecompressImageData {
+      CompressDecompressImageData node = new CompressDecompressImageData();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Varnish") && !(this instanceof Thing))
       to Varnish {
@@ -1444,18 +1305,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -1469,18 +1330,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -1502,31 +1363,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("BarcodeReader") && !(this instanceof Thing))
-      to BarcodeReader {
-      BarcodeReader node = new BarcodeReader();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("DiagnosticFunction") && !(this instanceof Thing))
       to DiagnosticFunction {
@@ -1693,31 +1529,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureAcceleration") && !(this instanceof Thing))
-      to MeasureAcceleration {
-      MeasureAcceleration node = new MeasureAcceleration();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Orient") && !(this instanceof Thing))
       to Orient {
@@ -1805,74 +1616,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("CollectStatisticalData") && !(this instanceof Thing))
-      to CollectStatisticalData {
-      CollectStatisticalData node = new CollectStatisticalData();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureMotionOfObject") && !(this instanceof Thing))
-      to MeasureMotionOfObject {
-      MeasureMotionOfObject node = new MeasureMotionOfObject();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("OpticProximitySwitch") && !(this instanceof Thing))
-      to OpticProximitySwitch {
-      OpticProximitySwitch node = new OpticProximitySwitch();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("SwitchingFrequency") && !(this instanceof Thing))
       to SwitchingFrequency {
@@ -1895,31 +1638,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("OpticDistanceSensor") && !(this instanceof Thing))
-      to OpticDistanceSensor {
-      OpticDistanceSensor node = new OpticDistanceSensor();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("NumericalCtrl") && !(this instanceof Thing))
       to NumericalCtrl {
@@ -1931,24 +1649,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Calibrate") && !(this instanceof Thing))
-      to Calibrate {
-      Calibrate node = new Calibrate();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Electroplate") && !(this instanceof Thing))
       to Electroplate {
@@ -1977,18 +1677,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -2029,9 +1729,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Convey") && !(this instanceof Thing))
-      to Convey {
-      Convey node = new Convey();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Circular") && !(this instanceof Thing))
+      to Circular {
+      Circular node = new Circular();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2047,9 +1747,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Circular") && !(this instanceof Thing))
-      to Circular {
-      Circular node = new Circular();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Convey") && !(this instanceof Thing))
+      to Convey {
+      Convey node = new Convey();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2123,45 +1823,45 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("ManipulationAndHandling") && !(this instanceof Thing))
-      to ManipulationAndHandling {
-      ManipulationAndHandling node = new ManipulationAndHandling();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Grind") && !(this instanceof Thing))
+      to Grind {
+      Grind node = new Grind();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Grind") && !(this instanceof Thing))
-      to Grind {
-      Grind node = new Grind();
+    when (getOwlIdentifier().getIDENTIFIER().equals("ManipulationAndHandling") && !(this instanceof Thing))
+      to ManipulationAndHandling {
+      ManipulationAndHandling node = new ManipulationAndHandling();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
@@ -2202,31 +1902,38 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Cost") && !(this instanceof Thing))
-      to Cost {
-      Cost node = new Cost();
+    when (getOwlIdentifier().getIDENTIFIER().equals("EncoderLinearDistanceSensor") && !(this instanceof Thing))
+      to EncoderLinearDistanceSensor {
+      EncoderLinearDistanceSensor node = new EncoderLinearDistanceSensor();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Property) {
+          l.add(getElement(i));
+        }
+      }
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("SetParameterValue") && !(this instanceof Thing))
-      to SetParameterValue {
-      SetParameterValue node = new SetParameterValue();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Cost") && !(this instanceof Thing))
+      to Cost {
+      Cost node = new Cost();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
       return node;
     }
   }
@@ -2253,9 +1960,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("PhysicalProperties") && !(this instanceof Thing))
-      to PhysicalProperties {
-      PhysicalProperties node = new PhysicalProperties();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Material") && !(this instanceof Thing))
+      to Material {
+      Material node = new Material();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2264,9 +1971,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Material") && !(this instanceof Thing))
-      to Material {
-      Material node = new Material();
+    when (getOwlIdentifier().getIDENTIFIER().equals("PhysicalProperties") && !(this instanceof Thing))
+      to PhysicalProperties {
+      PhysicalProperties node = new PhysicalProperties();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2275,9 +1982,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("LoadParameterSet") && !(this instanceof Thing))
-      to LoadParameterSet {
-      LoadParameterSet node = new LoadParameterSet();
+    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureDistance") && !(this instanceof Thing))
+      to MeasureDistance {
+      MeasureDistance node = new MeasureDistance();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2289,13 +1996,20 @@ aspect Rewrites {
         }
       }
       node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureDistance") && !(this instanceof Thing))
-      to MeasureDistance {
-      MeasureDistance node = new MeasureDistance();
+    when (getOwlIdentifier().getIDENTIFIER().equals("DetermineOrientationOfObject") && !(this instanceof Thing))
+      to DetermineOrientationOfObject {
+      DetermineOrientationOfObject node = new DetermineOrientationOfObject();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2327,18 +2041,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -2370,36 +2084,25 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Timing") && !(this instanceof Thing))
-      to Timing {
-      Timing node = new Timing();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Flang") && !(this instanceof Thing))
-      to Flang {
-      Flang node = new Flang();
+    when (getOwlIdentifier().getIDENTIFIER().equals("ReadOpticalCharacters") && !(this instanceof Thing))
+      to ReadOpticalCharacters {
+      ReadOpticalCharacters node = new ReadOpticalCharacters();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2411,13 +2114,20 @@ aspect Rewrites {
         }
       }
       node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("ReadOpticalCharacters") && !(this instanceof Thing))
-      to ReadOpticalCharacters {
-      ReadOpticalCharacters node = new ReadOpticalCharacters();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Flang") && !(this instanceof Thing))
+      to Flang {
+      Flang node = new Flang();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -2429,13 +2139,6 @@ aspect Rewrites {
         }
       }
       node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
       return node;
     }
   }
@@ -2478,18 +2181,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -2512,13 +2215,20 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("PhysicalInterface") && !(this instanceof Thing))
-      to PhysicalInterface {
-      PhysicalInterface node = new PhysicalInterface();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Glue") && !(this instanceof Thing))
+      to Glue {
+      Glue node = new Glue();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
       return node;
     }
   }
@@ -2541,20 +2251,13 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Glue") && !(this instanceof Thing))
-      to Glue {
-      Glue node = new Glue();
+    when (getOwlIdentifier().getIDENTIFIER().equals("PhysicalInterface") && !(this instanceof Thing))
+      to PhysicalInterface {
+      PhysicalInterface node = new PhysicalInterface();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
       return node;
     }
   }
@@ -2595,45 +2298,45 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("VisionSensor") && !(this instanceof Thing))
-      to VisionSensor {
-      VisionSensor node = new VisionSensor();
+    when (getOwlIdentifier().getIDENTIFIER().equals("AsFastAsPossible") && !(this instanceof Thing))
+      to AsFastAsPossible {
+      AsFastAsPossible node = new AsFastAsPossible();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("AsFastAsPossible") && !(this instanceof Thing))
-      to AsFastAsPossible {
-      AsFastAsPossible node = new AsFastAsPossible();
+    when (getOwlIdentifier().getIDENTIFIER().equals("VisionSensor") && !(this instanceof Thing))
+      to VisionSensor {
+      VisionSensor node = new VisionSensor();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
@@ -2723,68 +2426,61 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureForce") && !(this instanceof Thing))
-      to MeasureForce {
-      MeasureForce node = new MeasureForce();
+    when (getOwlIdentifier().getIDENTIFIER().equals("OpticContrastScanner") && !(this instanceof Thing))
+      to OpticContrastScanner {
+      OpticContrastScanner node = new OpticContrastScanner();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setSensorList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("OpticContrastScanner") && !(this instanceof Thing))
-      to OpticContrastScanner {
-      OpticContrastScanner node = new OpticContrastScanner();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Powder_coat") && !(this instanceof Thing))
+      to Powder_coat {
+      Powder_coat node = new Powder_coat();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
       return node;
     }
   }
@@ -2813,24 +2509,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Powder_coat") && !(this instanceof Thing))
-      to Powder_coat {
-      Powder_coat node = new Powder_coat();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("LightSpotSize") && !(this instanceof Thing))
       to LightSpotSize {
@@ -2889,31 +2567,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasurePositionOfObject") && !(this instanceof Thing))
-      to MeasurePositionOfObject {
-      MeasurePositionOfObject node = new MeasurePositionOfObject();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("GeneralParallelGripper") && !(this instanceof Thing))
       to GeneralParallelGripper {
@@ -2924,18 +2577,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3001,6 +2654,31 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("Sort") && !(this instanceof Thing))
+      to Sort {
+      Sort node = new Sort();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("ToolInterface") && !(this instanceof Thing))
       to ToolInterface {
@@ -3048,17 +2726,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("LaserClass") && !(this instanceof Thing))
-      to LaserClass {
-      LaserClass node = new LaserClass();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Mold") && !(this instanceof Thing))
       to Mold {
@@ -3077,6 +2744,17 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("LaserClass") && !(this instanceof Thing))
+      to LaserClass {
+      LaserClass node = new LaserClass();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Weight") && !(this instanceof Thing))
       to Weight {
@@ -3106,17 +2784,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Identifier") && !(this instanceof Thing))
-      to Identifier {
-      Identifier node = new Identifier();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Clinch") && !(this instanceof Thing))
       to Clinch {
@@ -3135,6 +2802,17 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("Identifier") && !(this instanceof Thing))
+      to Identifier {
+      Identifier node = new Identifier();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("ImageAnalysis") && !(this instanceof Thing))
       to ImageAnalysis {
@@ -3187,30 +2865,12 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
       node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("WireDrawEncoder") && !(this instanceof Thing))
-      to WireDrawEncoder {
-      WireDrawEncoder node = new WireDrawEncoder();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Skill) {
@@ -3218,13 +2878,6 @@ aspect Rewrites {
         }
       }
       node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
       return node;
     }
   }
@@ -3344,35 +2997,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("SaveParameterSet") && !(this instanceof Thing))
-      to SaveParameterSet {
-      SaveParameterSet node = new SaveParameterSet();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MaxForce") && !(this instanceof Thing))
-      to MaxForce {
-      MaxForce node = new MaxForce();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Thrust") && !(this instanceof Thing))
       to Thrust {
@@ -3401,18 +3025,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3435,9 +3059,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("SimpleControl") && !(this instanceof Thing))
-      to SimpleControl {
-      SimpleControl node = new SimpleControl();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Reachability") && !(this instanceof Thing))
+      to Reachability {
+      Reachability node = new Reachability();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -3446,9 +3070,9 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Reachability") && !(this instanceof Thing))
-      to Reachability {
-      Reachability node = new Reachability();
+    when (getOwlIdentifier().getIDENTIFIER().equals("SimpleControl") && !(this instanceof Thing))
+      to SimpleControl {
+      SimpleControl node = new SimpleControl();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -3466,18 +3090,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3499,49 +3123,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("PerformSelfTest") && !(this instanceof Thing))
-      to PerformSelfTest {
-      PerformSelfTest node = new PerformSelfTest();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("LightGrid") && !(this instanceof Thing))
-      to LightGrid {
-      LightGrid node = new LightGrid();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Lathe") && !(this instanceof Thing))
       to Lathe {
@@ -3570,18 +3151,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3622,34 +3203,34 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("DecompressImageData") && !(this instanceof Thing))
-      to DecompressImageData {
-      DecompressImageData node = new DecompressImageData();
+    when (getOwlIdentifier().getIDENTIFIER().equals("EncoderWireDrawDistanceSensor") && !(this instanceof Thing))
+      to EncoderWireDrawDistanceSensor {
+      EncoderWireDrawDistanceSensor node = new EncoderWireDrawDistanceSensor();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setSensorList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("CompressImageData") && !(this instanceof Thing))
-      to CompressImageData {
-      CompressImageData node = new CompressImageData();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Position") && !(this instanceof Thing))
+      to Position {
+      Position node = new Position();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -3661,13 +3242,6 @@ aspect Rewrites {
         }
       }
       node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
       return node;
     }
   }
@@ -3689,24 +3263,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Position") && !(this instanceof Thing))
-      to Position {
-      Position node = new Position();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("OpticSensor") && !(this instanceof Thing))
       to OpticSensor {
@@ -3716,55 +3272,12 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("OpticThroughBeamSwitch") && !(this instanceof Thing))
-      to OpticThroughBeamSwitch {
-      OpticThroughBeamSwitch node = new OpticThroughBeamSwitch();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
       node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("LinearEncoder") && !(this instanceof Thing))
-      to LinearEncoder {
-      LinearEncoder node = new LinearEncoder();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Skill) {
@@ -3772,13 +3285,6 @@ aspect Rewrites {
         }
       }
       node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
-          l.add(getElement(i));
-        }
-      }
-      node.setPropertyList(l);
       return node;
     }
   }
@@ -3810,18 +3316,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3914,18 +3420,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -3941,38 +3447,52 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Electro_discharge_machine") && !(this instanceof Thing))
-      to Electro_discharge_machine {
-      Electro_discharge_machine node = new Electro_discharge_machine();
+    when (getOwlIdentifier().getIDENTIFIER().equals("OpticThroughBeanSwitches") && !(this instanceof Thing))
+      to OpticThroughBeanSwitches {
+      OpticThroughBeanSwitches node = new OpticThroughBeanSwitches();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MaxVoltageSupply") && !(this instanceof Thing))
-      to MaxVoltageSupply {
-      MaxVoltageSupply node = new MaxVoltageSupply();
+    when (getOwlIdentifier().getIDENTIFIER().equals("Electro_discharge_machine") && !(this instanceof Thing))
+      to Electro_discharge_machine {
+      Electro_discharge_machine node = new Electro_discharge_machine();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("ControlSystem") && !(this instanceof Thing))
-      to ControlSystem {
-      ControlSystem node = new ControlSystem();
+    when (getOwlIdentifier().getIDENTIFIER().equals("MaxVoltageSupply") && !(this instanceof Thing))
+      to MaxVoltageSupply {
+      MaxVoltageSupply node = new MaxVoltageSupply();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -3998,6 +3518,17 @@ aspect Rewrites {
       return node;
     }
   }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("ControlSystem") && !(this instanceof Thing))
+      to ControlSystem {
+      ControlSystem node = new ControlSystem();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
+      return node;
+    }
+  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("Task") && !(this instanceof Thing))
       to Task {
@@ -4019,18 +3550,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4066,29 +3597,43 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MaxScanAngle") && !(this instanceof Thing))
-      to MaxScanAngle {
-      MaxScanAngle node = new MaxScanAngle();
+    when (getOwlIdentifier().getIDENTIFIER().equals("DetermineMotionOfObject") && !(this instanceof Thing))
+      to DetermineMotionOfObject {
+      DetermineMotionOfObject node = new DetermineMotionOfObject();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Device) {
+          l.add(getElement(i));
+        }
+      }
+      node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
       return node;
     }
   }
@@ -4102,18 +3647,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4185,18 +3730,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4221,61 +3766,61 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("SimpleKinematicRobot") && !(this instanceof Thing))
-      to SimpleKinematicRobot {
-      SimpleKinematicRobot node = new SimpleKinematicRobot();
+    when (getOwlIdentifier().getIDENTIFIER().equals("StoreInOrder") && !(this instanceof Thing))
+      to StoreInOrder {
+      StoreInOrder node = new StoreInOrder();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("StoreInOrder") && !(this instanceof Thing))
-      to StoreInOrder {
-      StoreInOrder node = new StoreInOrder();
+    when (getOwlIdentifier().getIDENTIFIER().equals("SimpleKinematicRobot") && !(this instanceof Thing))
+      to SimpleKinematicRobot {
+      SimpleKinematicRobot node = new SimpleKinematicRobot();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4307,18 +3852,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4356,19 +3901,44 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Property) {
+          l.add(getElement(i));
+        }
+      }
+      node.setPropertyList(l);
+      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
       node.setSkillList(l);
+      return node;
+    }
+  }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("DeterminePositionOfObject") && !(this instanceof Thing))
+      to DeterminePositionOfObject {
+      DeterminePositionOfObject node = new DeterminePositionOfObject();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Sensor) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSensorList(l);
       return node;
     }
   }
@@ -4407,18 +3977,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4450,18 +4020,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4569,17 +4139,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("PowerConsumption") && !(this instanceof Thing))
-      to PowerConsumption {
-      PowerConsumption node = new PowerConsumption();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("ElasticFingerGripper") && !(this instanceof Thing))
       to ElasticFingerGripper {
@@ -4590,25 +4149,25 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("NumberOfJoints") && !(this instanceof Thing))
-      to NumberOfJoints {
-      NumberOfJoints node = new NumberOfJoints();
+    when (getOwlIdentifier().getIDENTIFIER().equals("PowerConsumption") && !(this instanceof Thing))
+      to PowerConsumption {
+      PowerConsumption node = new PowerConsumption();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
@@ -4617,27 +4176,13 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureDiameter") && !(this instanceof Thing))
-      to MeasureDiameter {
-      MeasureDiameter node = new MeasureDiameter();
+    when (getOwlIdentifier().getIDENTIFIER().equals("NumberOfJoints") && !(this instanceof Thing))
+      to NumberOfJoints {
+      NumberOfJoints node = new NumberOfJoints();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
       return node;
     }
   }
@@ -4691,29 +4236,11 @@ aspect Rewrites {
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("MinAmbientTemperature") && !(this instanceof Thing))
       to MinAmbientTemperature {
-      MinAmbientTemperature node = new MinAmbientTemperature();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Feed") && !(this instanceof Thing))
-      to Feed {
-      Feed node = new Feed();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
+      MinAmbientTemperature node = new MinAmbientTemperature();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
       return node;
     }
   }
@@ -4726,19 +4253,37 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Property) {
+          l.add(getElement(i));
+        }
+      }
+      node.setPropertyList(l);
+      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
       node.setSkillList(l);
+      return node;
+    }
+  }
+  rewrite ComplexElement {
+    when (getOwlIdentifier().getIDENTIFIER().equals("Feed") && !(this instanceof Thing))
+      to Feed {
+      Feed node = new Feed();
+      node.setOwlIdentifier(getOwlIdentifier());
+      node.setAttributeList(getAttributeList());
+      node.setElementList(getElementList());
+      List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Device) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setDeviceList(l);
       return node;
     }
   }
@@ -4787,37 +4332,19 @@ aspect Rewrites {
       node.setElementList(getElementList());
       List l;
       l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSkillList(l);
-      l = new List();
       for (int i=0; i<getNumElement(); i++) {
         if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
       node.setPropertyList(l);
-      return node;
-    }
-  }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("Reset") && !(this instanceof Thing))
-      to Reset {
-      Reset node = new Reset();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setDeviceList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4849,18 +4376,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4875,31 +4402,6 @@ aspect Rewrites {
       return node;
     }
   }
-  rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("MeasureVolume") && !(this instanceof Thing))
-      to MeasureVolume {
-      MeasureVolume node = new MeasureVolume();
-      node.setOwlIdentifier(getOwlIdentifier());
-      node.setAttributeList(getAttributeList());
-      node.setElementList(getElementList());
-      List l;
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Device) {
-          l.add(getElement(i));
-        }
-      }
-      node.setDeviceList(l);
-      l = new List();
-      for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Sensor) {
-          l.add(getElement(i));
-        }
-      }
-      node.setSensorList(l);
-      return node;
-    }
-  }
   rewrite ComplexElement {
     when (getOwlIdentifier().getIDENTIFIER().equals("TactileSensor") && !(this instanceof Thing))
       to TactileSensor {
@@ -4910,18 +4412,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -4980,13 +4482,27 @@ aspect Rewrites {
     }
   }
   rewrite ComplexElement {
-    when (getOwlIdentifier().getIDENTIFIER().equals("FieldOfView") && !(this instanceof Thing))
-      to FieldOfView {
-      FieldOfView node = new FieldOfView();
+    when (getOwlIdentifier().getIDENTIFIER().equals("OpticDistanceSensorReflector") && !(this instanceof Thing))
+      to OpticDistanceSensorReflector {
+      OpticDistanceSensorReflector node = new OpticDistanceSensorReflector();
       node.setOwlIdentifier(getOwlIdentifier());
       node.setAttributeList(getAttributeList());
       node.setElementList(getElementList());
       List l;
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Property) {
+          l.add(getElement(i));
+        }
+      }
+      node.setPropertyList(l);
+      l = new List();
+      for (int i=0; i<getNumElement(); i++) {
+        if (getElement(i) instanceof Skill) {
+          l.add(getElement(i));
+        }
+      }
+      node.setSkillList(l);
       return node;
     }
   }
@@ -5033,18 +4549,18 @@ aspect Rewrites {
       List l;
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Skill) {
+        if (getElement(i) instanceof Property) {
           l.add(getElement(i));
         }
       }
-      node.setSkillList(l);
+      node.setPropertyList(l);
       l = new List();
       for (int i=0; i<getNumElement(); i++) {
-        if (getElement(i) instanceof Property) {
+        if (getElement(i) instanceof Skill) {
           l.add(getElement(i));
         }
       }
-      node.setPropertyList(l);
+      node.setSkillList(l);
       return node;
     }
   }
@@ -5075,6 +4591,12 @@ aspect PrettyPrinter {
     }
   }
 
+  public void Start.prettyPrint(String indent, PrintStream pStream) {
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(indent,pStream);
+    }
+  }
+
   public void HexapodRobot.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<HexapodRobot>");
     String childIndent = indent + "  ";
@@ -5174,15 +4696,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Hone>");
 }
 
-  public void MeasureTemperature.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureTemperature>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureTemperature>");
-}
-
   public void DetectColor.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<DetectColor>");
     String childIndent = indent + "  ";
@@ -5237,15 +4750,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Property>");
 }
 
-  public void MeasureOrientationOfObject.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureOrientationOfObject>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureOrientationOfObject>");
-}
-
   public void ManufacturingFunction.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<ManufacturingFunction>");
     String childIndent = indent + "  ";
@@ -5291,15 +4795,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</OpticLuminescenceScanner>");
 }
 
-  public void CheckPresence.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<CheckPresence>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</CheckPresence>");
-}
-
   public void ModifyWorkpieceProperties.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<ModifyWorkpieceProperties>");
     String childIndent = indent + "  ";
@@ -5327,6 +4822,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ReadBarCode>");
 }
 
+  public void MaximumForce.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<MaximumForce>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</MaximumForce>");
+}
+
   public void SmartCamera.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<SmartCamera>");
     String childIndent = indent + "  ";
@@ -5354,6 +4858,24 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Extrude>");
 }
 
+  public void OpticDistanceSensorScanner.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<OpticDistanceSensorScanner>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</OpticDistanceSensorScanner>");
+}
+
+  public void Determine.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Determine>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</Determine>");
+}
+
   public void CoordinateReferenceSystem.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<CoordinateReferenceSystem>");
     String childIndent = indent + "  ";
@@ -5399,15 +4921,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</BlobAnalysis>");
 }
 
-  public void LaserScanner2D.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<LaserScanner2D>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</LaserScanner2D>");
-}
-
   public void Store.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Store>");
     String childIndent = indent + "  ";
@@ -5444,15 +4957,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</SensorFunction>");
 }
 
-  public void MeasureSpeed.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureSpeed>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureSpeed>");
-}
-
   public void Pan.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Pan>");
     String childIndent = indent + "  ";
@@ -5489,15 +4993,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ClassifyObject>");
 }
 
-  public void MeasureTorque.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureTorque>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureTorque>");
-}
-
   public void FingerGripper.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<FingerGripper>");
     String childIndent = indent + "  ";
@@ -5624,15 +5119,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</TypeOfMagnet>");
 }
 
-  public void WheelEncoder.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<WheelEncoder>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</WheelEncoder>");
-}
-
   public void CycleTime.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<CycleTime>");
     String childIndent = indent + "  ";
@@ -5660,15 +5146,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ElectricalInterface>");
 }
 
-  public void DetectCollision.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<DetectCollision>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</DetectCollision>");
-}
-
   public void Accuracy.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Accuracy>");
     String childIndent = indent + "  ";
@@ -5723,15 +5200,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</PhysicalPropertiesGripper>");
 }
 
-  public void OpticSwitch.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<OpticSwitch>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</OpticSwitch>");
-}
-
   public void AdjustVacuumToGrip.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<AdjustVacuumToGrip>");
     String childIndent = indent + "  ";
@@ -5750,6 +5218,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Width>");
 }
 
+  public void CompressDecompressImageData.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<CompressDecompressImageData>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</CompressDecompressImageData>");
+}
+
   public void Varnish.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Varnish>");
     String childIndent = indent + "  ";
@@ -5786,15 +5263,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</AdditionalFunction>");
 }
 
-  public void BarcodeReader.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<BarcodeReader>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</BarcodeReader>");
-}
-
   public void DiagnosticFunction.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<DiagnosticFunction>");
     String childIndent = indent + "  ";
@@ -5885,15 +5353,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Bend>");
 }
 
-  public void MeasureAcceleration.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureAcceleration>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureAcceleration>");
-}
-
   public void Orient.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Orient>");
     String childIndent = indent + "  ";
@@ -5948,33 +5407,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Separate>");
 }
 
-  public void CollectStatisticalData.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<CollectStatisticalData>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</CollectStatisticalData>");
-}
-
-  public void MeasureMotionOfObject.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureMotionOfObject>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureMotionOfObject>");
-}
-
-  public void OpticProximitySwitch.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<OpticProximitySwitch>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</OpticProximitySwitch>");
-}
-
   public void SwitchingFrequency.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<SwitchingFrequency>");
     String childIndent = indent + "  ";
@@ -5993,15 +5425,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</PhysicalPropertiesSensor>");
 }
 
-  public void OpticDistanceSensor.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<OpticDistanceSensor>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</OpticDistanceSensor>");
-}
-
   public void NumericalCtrl.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<NumericalCtrl>");
     String childIndent = indent + "  ";
@@ -6011,15 +5434,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</NumericalCtrl>");
 }
 
-  public void Calibrate.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Calibrate>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</Calibrate>");
-}
-
   public void Electroplate.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Electroplate>");
     String childIndent = indent + "  ";
@@ -6056,22 +5470,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Detect>");
 }
 
-  public void Convey.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Convey>");
+  public void Circular.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Circular>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Convey>");
+    System.out.println(indent+"</Circular>");
 }
 
-  public void Circular.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Circular>");
+  public void Convey.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Convey>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Circular>");
+    System.out.println(indent+"</Convey>");
 }
 
   public void ShapeOfClaws.prettyPrint(String indent, PrintStream pStream) {
@@ -6110,22 +5524,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</SortObjects>");
 }
 
-  public void ManipulationAndHandling.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<ManipulationAndHandling>");
+  public void Grind.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Grind>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</ManipulationAndHandling>");
+    System.out.println(indent+"</Grind>");
 }
 
-  public void Grind.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Grind>");
+  public void ManipulationAndHandling.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<ManipulationAndHandling>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Grind>");
+    System.out.println(indent+"</ManipulationAndHandling>");
 }
 
   public void Classify.prettyPrint(String indent, PrintStream pStream) {
@@ -6146,22 +5560,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</BusInterface>");
 }
 
-  public void Cost.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Cost>");
+  public void EncoderLinearDistanceSensor.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<EncoderLinearDistanceSensor>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Cost>");
+    System.out.println(indent+"</EncoderLinearDistanceSensor>");
 }
 
-  public void SetParameterValue.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<SetParameterValue>");
+  public void Cost.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Cost>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</SetParameterValue>");
+    System.out.println(indent+"</Cost>");
 }
 
   public void StiffnessOfGripper.prettyPrint(String indent, PrintStream pStream) {
@@ -6182,15 +5596,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Height>");
 }
 
-  public void PhysicalProperties.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<PhysicalProperties>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</PhysicalProperties>");
-}
-
   public void Material.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Material>");
     String childIndent = indent + "  ";
@@ -6200,13 +5605,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Material>");
 }
 
-  public void LoadParameterSet.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<LoadParameterSet>");
+  public void PhysicalProperties.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<PhysicalProperties>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</LoadParameterSet>");
+    System.out.println(indent+"</PhysicalProperties>");
 }
 
   public void MeasureDistance.prettyPrint(String indent, PrintStream pStream) {
@@ -6218,6 +5623,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</MeasureDistance>");
 }
 
+  public void DetermineOrientationOfObject.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<DetermineOrientationOfObject>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</DetermineOrientationOfObject>");
+}
+
   public void MagnetGripper.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<MagnetGripper>");
     String childIndent = indent + "  ";
@@ -6245,13 +5659,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</TorqueForceSensor>");
 }
 
-  public void Timing.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Timing>");
+  public void ReadOpticalCharacters.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<ReadOpticalCharacters>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Timing>");
+    System.out.println(indent+"</ReadOpticalCharacters>");
 }
 
   public void Flang.prettyPrint(String indent, PrintStream pStream) {
@@ -6263,15 +5677,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Flang>");
 }
 
-  public void ReadOpticalCharacters.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<ReadOpticalCharacters>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</ReadOpticalCharacters>");
-}
-
   public void Diameter.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Diameter>");
     String childIndent = indent + "  ";
@@ -6308,13 +5713,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</StorePartlyOrdered>");
 }
 
-  public void PhysicalInterface.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<PhysicalInterface>");
+  public void Glue.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Glue>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</PhysicalInterface>");
+    System.out.println(indent+"</Glue>");
 }
 
   public void Deep_Draw.prettyPrint(String indent, PrintStream pStream) {
@@ -6326,13 +5731,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Deep_Draw>");
 }
 
-  public void Glue.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Glue>");
+  public void PhysicalInterface.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<PhysicalInterface>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Glue>");
+    System.out.println(indent+"</PhysicalInterface>");
 }
 
   public void ManipulationAndHandlingFunction.prettyPrint(String indent, PrintStream pStream) {
@@ -6353,22 +5758,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</OpenClaws>");
 }
 
-  public void VisionSensor.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<VisionSensor>");
+  public void AsFastAsPossible.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<AsFastAsPossible>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</VisionSensor>");
+    System.out.println(indent+"</AsFastAsPossible>");
 }
 
-  public void AsFastAsPossible.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<AsFastAsPossible>");
+  public void VisionSensor.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<VisionSensor>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</AsFastAsPossible>");
+    System.out.println(indent+"</VisionSensor>");
 }
 
   public void Pass.prettyPrint(String indent, PrintStream pStream) {
@@ -6425,15 +5830,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</CartesianRobot>");
 }
 
-  public void MeasureForce.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureForce>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureForce>");
-}
-
   public void OpticContrastScanner.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<OpticContrastScanner>");
     String childIndent = indent + "  ";
@@ -6443,22 +5839,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</OpticContrastScanner>");
 }
 
-  public void CheckSurfaceForIrregularities.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<CheckSurfaceForIrregularities>");
+  public void Powder_coat.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Powder_coat>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</CheckSurfaceForIrregularities>");
+    System.out.println(indent+"</Powder_coat>");
 }
 
-  public void Powder_coat.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Powder_coat>");
+  public void CheckSurfaceForIrregularities.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<CheckSurfaceForIrregularities>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Powder_coat>");
+    System.out.println(indent+"</CheckSurfaceForIrregularities>");
 }
 
   public void LightSpotSize.prettyPrint(String indent, PrintStream pStream) {
@@ -6497,15 +5893,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Part>");
 }
 
-  public void MeasurePositionOfObject.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasurePositionOfObject>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasurePositionOfObject>");
-}
-
   public void GeneralParallelGripper.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<GeneralParallelGripper>");
     String childIndent = indent + "  ";
@@ -6560,6 +5947,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</NumberOfMovableClaws>");
 }
 
+  public void Sort.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Sort>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</Sort>");
+}
+
   public void ToolInterface.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<ToolInterface>");
     String childIndent = indent + "  ";
@@ -6587,22 +5983,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Divide>");
 }
 
-  public void LaserClass.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<LaserClass>");
+  public void Mold.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Mold>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</LaserClass>");
+    System.out.println(indent+"</Mold>");
 }
 
-  public void Mold.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Mold>");
+  public void LaserClass.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<LaserClass>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Mold>");
+    System.out.println(indent+"</LaserClass>");
 }
 
   public void Weight.prettyPrint(String indent, PrintStream pStream) {
@@ -6623,22 +6019,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Merge>");
 }
 
-  public void Identifier.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Identifier>");
+  public void Clinch.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Clinch>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Identifier>");
+    System.out.println(indent+"</Clinch>");
 }
 
-  public void Clinch.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Clinch>");
+  public void Identifier.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Identifier>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Clinch>");
+    System.out.println(indent+"</Identifier>");
 }
 
   public void ImageAnalysis.prettyPrint(String indent, PrintStream pStream) {
@@ -6668,15 +6064,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</TactileProximitySwitch>");
 }
 
-  public void WireDrawEncoder.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<WireDrawEncoder>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</WireDrawEncoder>");
-}
-
   public void Precision.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Precision>");
     String childIndent = indent + "  ";
@@ -6749,24 +6136,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ElectricalConnector>");
 }
 
-  public void SaveParameterSet.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<SaveParameterSet>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</SaveParameterSet>");
-}
-
-  public void MaxForce.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MaxForce>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MaxForce>");
-}
-
   public void Thrust.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Thrust>");
     String childIndent = indent + "  ";
@@ -6794,22 +6163,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Sinter>");
 }
 
-  public void SimpleControl.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<SimpleControl>");
+  public void Reachability.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Reachability>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</SimpleControl>");
+    System.out.println(indent+"</Reachability>");
 }
 
-  public void Reachability.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Reachability>");
+  public void SimpleControl.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<SimpleControl>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Reachability>");
+    System.out.println(indent+"</SimpleControl>");
 }
 
   public void OpticReflexSwitch.prettyPrint(String indent, PrintStream pStream) {
@@ -6830,24 +6199,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Fold>");
 }
 
-  public void PerformSelfTest.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<PerformSelfTest>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</PerformSelfTest>");
-}
-
-  public void LightGrid.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<LightGrid>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</LightGrid>");
-}
-
   public void Lathe.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Lathe>");
     String childIndent = indent + "  ";
@@ -6884,22 +6235,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Press>");
 }
 
-  public void DecompressImageData.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<DecompressImageData>");
+  public void EncoderWireDrawDistanceSensor.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<EncoderWireDrawDistanceSensor>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</DecompressImageData>");
+    System.out.println(indent+"</EncoderWireDrawDistanceSensor>");
 }
 
-  public void CompressImageData.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<CompressImageData>");
+  public void Position.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Position>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</CompressImageData>");
+    System.out.println(indent+"</Position>");
 }
 
   public void Hot_galvanise.prettyPrint(String indent, PrintStream pStream) {
@@ -6911,15 +6262,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Hot_galvanise>");
 }
 
-  public void Position.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Position>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</Position>");
-}
-
   public void OpticSensor.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<OpticSensor>");
     String childIndent = indent + "  ";
@@ -6929,24 +6271,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</OpticSensor>");
 }
 
-  public void OpticThroughBeamSwitch.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<OpticThroughBeamSwitch>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</OpticThroughBeamSwitch>");
-}
-
-  public void LinearEncoder.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<LinearEncoder>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</LinearEncoder>");
-}
-
   public void Displace.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Displace>");
     String childIndent = indent + "  ";
@@ -7019,6 +6343,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</InsideOrOutsidePicking>");
 }
 
+  public void OpticThroughBeanSwitches.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<OpticThroughBeanSwitches>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</OpticThroughBeanSwitches>");
+}
+
   public void Electro_discharge_machine.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Electro_discharge_machine>");
     String childIndent = indent + "  ";
@@ -7037,22 +6370,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</MaxVoltageSupply>");
 }
 
-  public void ControlSystem.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<ControlSystem>");
+  public void Assign.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Assign>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</ControlSystem>");
+    System.out.println(indent+"</Assign>");
 }
 
-  public void Assign.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Assign>");
+  public void ControlSystem.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<ControlSystem>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Assign>");
+    System.out.println(indent+"</ControlSystem>");
 }
 
   public void Task.prettyPrint(String indent, PrintStream pStream) {
@@ -7100,13 +6433,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</LineParallelGripper>");
 }
 
-  public void MaxScanAngle.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MaxScanAngle>");
+  public void DetermineMotionOfObject.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<DetermineMotionOfObject>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</MaxScanAngle>");
+    System.out.println(indent+"</DetermineMotionOfObject>");
 }
 
   public void UltrasonicDistanceSensor.prettyPrint(String indent, PrintStream pStream) {
@@ -7181,22 +6514,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ScaraRobot>");
 }
 
-  public void SimpleKinematicRobot.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<SimpleKinematicRobot>");
+  public void StoreInOrder.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<StoreInOrder>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</SimpleKinematicRobot>");
+    System.out.println(indent+"</StoreInOrder>");
 }
 
-  public void StoreInOrder.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<StoreInOrder>");
+  public void SimpleKinematicRobot.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<SimpleKinematicRobot>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</StoreInOrder>");
+    System.out.println(indent+"</SimpleKinematicRobot>");
 }
 
   public void Cut.prettyPrint(String indent, PrintStream pStream) {
@@ -7235,6 +6568,15 @@ aspect PrettyPrinter {
     System.out.println(indent+"</AngleGripper>");
 }
 
+  public void DeterminePositionOfObject.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<DeterminePositionOfObject>");
+    String childIndent = indent + "  ";
+    for (int i=0; i<getNumElement(); i++) {
+      getElement(i).prettyPrint(childIndent,pStream);
+    }
+    System.out.println(indent+"</DeterminePositionOfObject>");
+}
+
   public void CheckPosition.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<CheckPosition>");
     String childIndent = indent + "  ";
@@ -7316,15 +6658,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Unify>");
 }
 
-  public void PowerConsumption.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<PowerConsumption>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</PowerConsumption>");
-}
-
   public void ElasticFingerGripper.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<ElasticFingerGripper>");
     String childIndent = indent + "  ";
@@ -7334,22 +6667,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</ElasticFingerGripper>");
 }
 
-  public void NumberOfJoints.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<NumberOfJoints>");
+  public void PowerConsumption.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<PowerConsumption>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</NumberOfJoints>");
+    System.out.println(indent+"</PowerConsumption>");
 }
 
-  public void MeasureDiameter.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureDiameter>");
+  public void NumberOfJoints.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<NumberOfJoints>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</MeasureDiameter>");
+    System.out.println(indent+"</NumberOfJoints>");
 }
 
   public void ElectrolyticSegregate.prettyPrint(String indent, PrintStream pStream) {
@@ -7388,22 +6721,22 @@ aspect PrettyPrinter {
     System.out.println(indent+"</MinAmbientTemperature>");
 }
 
-  public void Feed.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Feed>");
+  public void InductiveProximitySwitch.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<InductiveProximitySwitch>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</Feed>");
+    System.out.println(indent+"</InductiveProximitySwitch>");
 }
 
-  public void InductiveProximitySwitch.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<InductiveProximitySwitch>");
+  public void Feed.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<Feed>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</InductiveProximitySwitch>");
+    System.out.println(indent+"</Feed>");
 }
 
   public void Scan.prettyPrint(String indent, PrintStream pStream) {
@@ -7433,15 +6766,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</Manufacturing>");
 }
 
-  public void Reset.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<Reset>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</Reset>");
-}
-
   public void Release.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<Release>");
     String childIndent = indent + "  ";
@@ -7469,15 +6793,6 @@ aspect PrettyPrinter {
     System.out.println(indent+"</EnclosureRatingIP>");
 }
 
-  public void MeasureVolume.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<MeasureVolume>");
-    String childIndent = indent + "  ";
-    for (int i=0; i<getNumElement(); i++) {
-      getElement(i).prettyPrint(childIndent,pStream);
-    }
-    System.out.println(indent+"</MeasureVolume>");
-}
-
   public void TactileSensor.prettyPrint(String indent, PrintStream pStream) {
     System.out.println(indent+"<TactileSensor>");
     String childIndent = indent + "  ";
@@ -7514,13 +6829,13 @@ aspect PrettyPrinter {
     System.out.println(indent+"</PhysicalPropertiesRobot>");
 }
 
-  public void FieldOfView.prettyPrint(String indent, PrintStream pStream) {
-    System.out.println(indent+"<FieldOfView>");
+  public void OpticDistanceSensorReflector.prettyPrint(String indent, PrintStream pStream) {
+    System.out.println(indent+"<OpticDistanceSensorReflector>");
     String childIndent = indent + "  ";
     for (int i=0; i<getNumElement(); i++) {
       getElement(i).prettyPrint(childIndent,pStream);
     }
-    System.out.println(indent+"</FieldOfView>");
+    System.out.println(indent+"</OpticDistanceSensorReflector>");
 }
 
   public void WorkCoordinates.prettyPrint(String indent, PrintStream pStream) {
-- 
GitLab