Changeset 2164

Timestamp:

Apr 18, 2006, 11:25:15 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #171: Experimental factor for experiments

Location:

trunk

Files:

• doc/development/overview/data/experiments.png (modified) (previous)
• doc/uml/dataclasses.uml.xml (modified) (119 diffs)
• src/core/common-queries.xml (modified) (2 diffs)
• src/core/net/sf/basedb/core/AnnotationSet.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/AnnotationType.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Experiment.java (modified) (1 diff)
• src/core/net/sf/basedb/core/Install.java (modified) (2 diffs)
• src/core/net/sf/basedb/core/Update.java (modified) (4 diffs)
• src/core/net/sf/basedb/core/data/AnnotationTypeData.java (modified) (1 diff)
• src/core/net/sf/basedb/core/data/ExperimentData.java (modified) (1 diff)
• www/views/experiments/edit_experiment.jsp (modified) (8 diffs)
• www/views/experiments/index.jsp (modified) (2 diffs)
• www/views/experiments/view_experiment.jsp (modified) (4 diffs)

trunk/doc/uml/dataclasses.uml.xml

@@ -7817 +7817 @@
           <UML:Stereotype.baseClass >Flow</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943164_535253_487' >
+            <UML:Comment xmi.id = 'nicklas_1145341543596_213695_489' >
               <UML:ModelElement.name > Specifies a Flow relationship, source and target of which represent the same instance at different points in time, but each with potentially different values, state instance, and roles. A Become Dependency from A to B means that instance A becomes B with possibly new values, state instance, and roles at a different moment in time/space.</UML:ModelElement.name>
             </UML:Comment>
@@ -7829 +7829 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943164_927226_488' >
+            <UML:Comment xmi.id = 'nicklas_1145341543596_746390_490' >
               <UML:ModelElement.name >Denotes a static or dynamic library file. Subclass of «file».</UML:ModelElement.name>
             </UML:Comment>
@@ -7857 +7857 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943164_48705_489' >
+            <UML:Comment xmi.id = 'nicklas_1145341543597_659203_491' >
               <UML:ModelElement.name >A model library is a stereotyped package that contains model elements that are intended to be reused by other packages. A model library differs from a profile in that a model library does not extend the metamodel using stereotypes and tagged definitions. A model library is analogous to a class library in some programming languages.</UML:ModelElement.name>
             </UML:Comment>
@@ -7869 +7869 @@
           <UML:Stereotype.baseClass >ObjectFlowState</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943165_885519_490' >
+            <UML:Comment xmi.id = 'nicklas_1145341543597_397451_492' >
               <UML:ModelElement.name >Signalflow is a stereotype of ObjectFlowState with a Signal as its type.</UML:ModelElement.name>
             </UML:Comment>
@@ -7881 +7881 @@
           <UML:Stereotype.baseClass >CallEvent</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943165_347980_491' >
+            <UML:Comment xmi.id = 'nicklas_1145341543597_677674_493' >
               <UML:ModelElement.name >Create is a stereotyped call event denoting that the instance receiving that event has just been created. For state machines, it triggers the initial transition at the topmost level of the state machine (and is the only kind of trigger that may be applied to an initial transition).</UML:ModelElement.name>
             </UML:Comment>
@@ -7909 +7909 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943165_4244_492' >
+            <UML:Comment xmi.id = 'nicklas_1145341543597_645573_494' >
               <UML:ModelElement.name >Denotes a program file that can be executed on a computer system.Subclass of «file».</UML:ModelElement.name>
             </UML:Comment>
@@ -7921 +7921 @@
           <UML:Stereotype.baseClass >Component</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943165_756178_493' >
+            <UML:Comment xmi.id = 'nicklas_1145341543598_610358_495' >
               <UML:ModelElement.name >Denotes a document.</UML:ModelElement.name>
             </UML:Comment>
@@ -7933 +7933 @@
           <UML:Stereotype.baseClass >Constraint</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943165_974422_494' >
+            <UML:Comment xmi.id = 'nicklas_1145341543598_809991_496' >
               <UML:ModelElement.name >Specifies a constraint that must be attached to a state vertex in a state machine that has a classifier for a context. The stereotype indicates that the constraint holds for instances of the classifier when an instance is in that state.</UML:ModelElement.name>
             </UML:Comment>
@@ -7945 +7945 @@
           <UML:Stereotype.baseClass >Usage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_364346_495' >
+            <UML:Comment xmi.id = 'nicklas_1145341543598_45905_497' >
               <UML:ModelElement.name >Call is a stereotyped usage dependency whose source is an operation and whose target is an operation. The relationship may also be subsumed to the class containing an operation, with the meaning that there exists an operation in the class to which the dependency applies. A call dependency specifies that the source operation or an operation in the source class invokes the target operation or an operation in the target class. A call dependency may connect a source operation to any target operation that is within scope including, but not limited to, operations of the enclosing classifier and operations of other visible classifiers.</UML:ModelElement.name>
             </UML:Comment>
@@ -7957 +7957 @@
           <UML:Stereotype.baseClass >Permission</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_771429_496' >
+            <UML:Comment xmi.id = 'nicklas_1145341543598_925750_498' >
               <UML:ModelElement.name >Import is a stereotyped permission dependency between two namespaces, denoting that the public contents of the target package are added to the namespace of the source package.</UML:ModelElement.name>
             </UML:Comment>
@@ -7969 +7969 @@
           <UML:Stereotype.baseClass >AssociationEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_620959_497' >
+            <UML:Comment xmi.id = 'nicklas_1145341543599_976864_499' >
               <UML:ModelElement.name >Specifies that the relationship represents a reference to the object that  AssociationEnd owns an operation or action rather than an actual association.</UML:ModelElement.name>
             </UML:Comment>
@@ -7981 +7981 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_245744_498' >
+            <UML:Comment xmi.id = 'nicklas_1145341543599_600566_500' >
               <UML:ModelElement.name >A framework is a stereotyped package consisting mainly of patterns, where patterns are defined as template collaborations.</UML:ModelElement.name>
             </UML:Comment>
@@ -8012 +8012 @@
           <UML:Stereotype.baseClass >Stimulus</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_821869_499' >
+            <UML:Comment xmi.id = 'nicklas_1145341543599_623133_501' >
               <UML:ModelElement.name >A time-out message the sender sends for a given period of time while waiting for acknowledgment by recipient. The sender is freed up if the acknowledgment does not occur within the duration specified in the description.</UML:ModelElement.name>
             </UML:Comment>
@@ -8024 +8024 @@
           <UML:Stereotype.baseClass >Usage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943166_372984_500' >
+            <UML:Comment xmi.id = 'nicklas_1145341543630_659112_502' >
               <UML:ModelElement.name >A stereotyped usage dependency among classifiers indicating that operations on the client create instances of the supplier.</UML:ModelElement.name>
             </UML:Comment>
@@ -8036 +8036 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943167_299601_501' >
+            <UML:Comment xmi.id = 'nicklas_1145341543630_842016_503' >
               <UML:ModelElement.name >Denotes a generic file that is not a «source» file or «executable». Subclass of «file».</UML:ModelElement.name>
             </UML:Comment>
@@ -8048 +8048 @@
           <UML:Stereotype.baseClass >LinkEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943167_766997_502' >
+            <UML:Comment xmi.id = 'nicklas_1145341543630_940289_504' >
               <UML:ModelElement.name > Self is a constraint applied to a link-end, specifying that the corresponding instance is visible because it is the dispatcher of the request.</UML:ModelElement.name>
             </UML:Comment>
@@ -8060 +8060 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943167_901042_503' >
+            <UML:Comment xmi.id = 'nicklas_1145341543630_818927_505' >
               <UML:ModelElement.name >Denotes a source file that can be compiled into an executable file.Subclass of «file».</UML:ModelElement.name>
             </UML:Comment>
@@ -8072 +8072 @@
           <UML:Stereotype.baseClass >Constraint</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943167_727402_504' >
+            <UML:Comment xmi.id = 'nicklas_1145341543630_355332_506' >
               <UML:ModelElement.name >Specifies a constraint that must be attached to a set of classifiers or relationships. It indicates that the conditions of the constraint must hold over time (for the time period of concern in the particular  containing element) for the classifiers or relationships and their instances.</UML:ModelElement.name>
             </UML:Comment>
@@ -8151 +8151 @@
           <UML:Stereotype.baseClass >BehavioralFeature</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943168_472834_505' >
+            <UML:Comment xmi.id = 'nicklas_1145341543631_997948_507' >
               <UML:ModelElement.name > Specifies that the designated feature creates an instance of the BehavioralFeature classifier to which the feature is attached. May be promoted to the Classifier containing the feature.</UML:ModelElement.name>
             </UML:Comment>
@@ -8163 +8163 @@
           <UML:Stereotype.baseClass >Association</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943168_257425_506' >
+            <UML:Comment xmi.id = 'nicklas_1145341543632_995481_508' >
               <UML:ModelElement.name > The «implicit» stereotype is applied to an association, specifying that the association is not manifest, but rather is only conceptual.</UML:ModelElement.name>
             </UML:Comment>
@@ -8175 +8175 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943168_408419_507' >
+            <UML:Comment xmi.id = 'nicklas_1145341543632_679310_509' >
               <UML:ModelElement.name >A facade is a stereotyped package containing only references to model elements owned by another package. It is used to provide a  public view  of some of the contents of a package. A facade does not contain any model elements of its own.</UML:ModelElement.name>
             </UML:Comment>
@@ -8187 +8187 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943168_396324_508' >
+            <UML:Comment xmi.id = 'nicklas_1145341543632_948283_510' >
               <UML:ModelElement.name >A profile is a stereotyped package that contains model elements that have been customized for a specific domain or purpose using extension mechanisms, such as stereotypes, tagged definitions, and constraints. A profile may also specify model libraries on which it depends and the metamodel subset that it extends. (The latter is specified via an applicableSubset tag definition.)</UML:ModelElement.name>
             </UML:Comment>
@@ -8199 +8199 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943168_292205_509' >
+            <UML:Comment xmi.id = 'nicklas_1145341543632_233988_511' >
               <UML:ModelElement.name >TopLevel is a stereotype of package denoting the top-most package in a containment hierarchy. The topLevel stereotype defines the outer limit for looking up names, as namespaces  see  outwards. A topLevel subsystem represents the top of the subsystem containment hierarchy, i.e., it is the model element that represents the boundary of the entire physical system being modeled.</UML:ModelElement.name>
             </UML:Comment>
@@ -8227 +8227 @@
           <UML:Stereotype.baseClass >Flow</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943169_813280_510' >
+            <UML:Comment xmi.id = 'nicklas_1145341543632_558109_512' >
               <UML:ModelElement.name >Specifies a Flow relationship, the source and target of which are different instances, but each with the same values, state instance, and roles (but a distinct identity). A Copy Dependency from A to B means that B is an exact copy of A. Future changes in A are not necessarily reflected in B.</UML:ModelElement.name>
             </UML:Comment>
@@ -8239 +8239 @@
           <UML:Stereotype.baseClass >LinkEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943169_575036_511' >
+            <UML:Comment xmi.id = 'nicklas_1145341543633_707097_513' >
               <UML:ModelElement.name > Association is a constraint applied to a link-end, specifying that the corresponding instance is visible via association.</UML:ModelElement.name>
             </UML:Comment>
@@ -8251 +8251 @@
           <UML:Stereotype.baseClass >ModelPackage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943169_809701_512' >
+            <UML:Comment xmi.id = 'nicklas_1145341543633_181238_514' >
               <UML:ModelElement.name >A stub is a stereotyped package representing a package that is incompletely transferred; specifically, a stub provides the public parts of the package, but nothing more.</UML:ModelElement.name>
             </UML:Comment>
@@ -8263 +8263 @@
           <UML:Stereotype.baseClass >Abstraction</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943169_379865_513' >
+            <UML:Comment xmi.id = 'nicklas_1145341543633_585471_515' >
               <UML:ModelElement.name >(Name for the stereotyped class is Trace.) Specifies a trace relationship between model elements or sets of model elements that represent the same concept in different models. Traces are mainly used for tracking requirements and changes across models. Since model changes can occur in both directions, the directionality of the dependency can often be ignored. The mapping specifies the relationship between the two, but it is rarely computable and is usually informal.</UML:ModelElement.name>
             </UML:Comment>
@@ -8275 +8275 @@
           <UML:Stereotype.baseClass >Generalization</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943169_780858_514' >
+            <UML:Comment xmi.id = 'nicklas_1145341543633_336944_516' >
               <UML:ModelElement.name >Specifies that the child inherits the implementation of the parent (its attributes, operations and methods) but does not make public the supplier s interfaces nor guarantee to support them, thereby violating substitutability. This is private inheritance and is usually used only for programming implementation purposes.</UML:ModelElement.name>
             </UML:Comment>
@@ -8341 +8341 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943171_643901_515' >
+            <UML:Comment xmi.id = 'nicklas_1145341543634_465109_517' >
               <UML:ModelElement.name >Denotes a physical file in the context of the system developed.</UML:ModelElement.name>
             </UML:Comment>
@@ -8376 +8376 @@
           <UML:Stereotype.baseClass >Usage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943171_355233_516' >
+            <UML:Comment xmi.id = 'nicklas_1145341543635_356650_518' >
               <UML:ModelElement.name >Create is a stereotyped usage dependency denoting that the client classifier creates instances of the supplier classifier.</UML:ModelElement.name>
             </UML:Comment>
@@ -8388 +8388 @@
           <UML:Stereotype.baseClass >BehavioralFeature</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943171_108464_517' >
+            <UML:Comment xmi.id = 'nicklas_1145341543635_186130_519' >
               <UML:ModelElement.name >Specifies that the designated feature destroys an instance of the BehavioralFeature classifier to which the feature is attached. May be promoted to the  classifier containing the feature.</UML:ModelElement.name>
             </UML:Comment>
@@ -8406 +8406 @@
           <UML:Stereotype.baseClass >Permission</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943172_123649_518' >
+            <UML:Comment xmi.id = 'nicklas_1145341543635_762714_520' >
               <UML:ModelElement.name > Friend is a stereotyped permission dependency whose source is a model element, such as an operation, class, or package, and whose target is a model element in a different package, such as an operation, class or package. A friend relationship grants the source access to the target regardless of the declared visibility. It extends the visibility of the supplier so that the client can see into the supplier.</UML:ModelElement.name>
             </UML:Comment>
@@ -8418 +8418 @@
           <UML:Stereotype.baseClass >Component</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943172_253286_519' >
+            <UML:Comment xmi.id = 'nicklas_1145341543635_12095_521' >
               <UML:ModelElement.name >Denotes a static or dynamic library.</UML:ModelElement.name>
             </UML:Comment>
@@ -8528 +8528 @@
           <UML:Stereotype.baseClass >Stimulus</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943173_305852_520' >
+            <UML:Comment xmi.id = 'nicklas_1145341543637_261337_522' >
               <UML:ModelElement.name >message In the balking message case the sender abandons the message if the receiver is not ready.</UML:ModelElement.name>
             </UML:Comment>
@@ -8540 +8540 @@
           <UML:Stereotype.baseClass >LinkEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943173_299259_521' >
+            <UML:Comment xmi.id = 'nicklas_1145341543637_563443_523' >
               <UML:ModelElement.name > Parameter is a constraint applied to a link-end, specifying that the corresponding instance is visible because it is in a parameter scope relative to the link.</UML:ModelElement.name>
             </UML:Comment>
@@ -8552 +8552 @@
           <UML:Stereotype.baseClass >AssociationEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943173_298879_522' >
+            <UML:Comment xmi.id = 'nicklas_1145341543637_270928_524' >
               <UML:ModelElement.name >  Specifies that the relationship represents a local variable within a AssociationEnd procedure rather than an actual association.</UML:ModelElement.name>
             </UML:Comment>
@@ -8564 +8564 @@
           <UML:Stereotype.baseClass >AssociationEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943173_361843_523' >
+            <UML:Comment xmi.id = 'nicklas_1145341543638_308116_525' >
               <UML:ModelElement.name > Specifies a real association (default and redundant, but may be included AssociationEnd for emphasis).</UML:ModelElement.name>
             </UML:Comment>
@@ -8576 +8576 @@
           <UML:Stereotype.baseClass >Dependency</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943174_681131_524' >
+            <UML:Comment xmi.id = 'nicklas_1145341543638_703856_526' >
               <UML:ModelElement.name >This dependency is used to indicate which profiles are applicable to a package. Typically, the client is an ordinary package or a model (but could be any other kind of package), while the supplier is a profile package. This means that the profile applies transitively to the model elements contained in the client package, including the client package itself.</UML:ModelElement.name>
             </UML:Comment>
@@ -8588 +8588 @@
           <UML:Stereotype.baseClass >Abstraction</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943174_793884_525' >
+            <UML:Comment xmi.id = 'nicklas_1145341543638_443858_527' >
               <UML:ModelElement.name >(Name for the stereotyped class is Realization.) Specifies a realization relationship between a specification model element or elements (the supplier) and a model element or elements that implement it (the client). The implementation model element is required to support all of the operations or received signals that the specification model element declares. The implementation model element must make or inherit its own declarations of the operations and signal receptions. The mapping specifies the relationship between the two. The mapping may or may not be computable. Realization can be used to model stepwise refinement, optimizations, transformations, templates, model synthesis, framework composition, etc.</UML:ModelElement.name>
             </UML:Comment>
@@ -8647 +8647 @@
           <UML:Stereotype.baseClass >Message</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943174_483936_526' >
+            <UML:Comment xmi.id = 'nicklas_1145341543639_417614_528' >
               <UML:ModelElement.name >message In the balking message case the sender abandons the message if the receiver is not ready.</UML:ModelElement.name>
             </UML:Comment>
@@ -8659 +8659 @@
           <UML:Stereotype.baseClass >Message</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_607041_527' >
+            <UML:Comment xmi.id = 'nicklas_1145341543639_344307_529' >
               <UML:ModelElement.name >A time-out message the sender sends for a given period of time while waiting for acknowledgment by recipient. The sender is freed up if the acknowledgment does not occur within the duration specified in the description.</UML:ModelElement.name>
             </UML:Comment>
@@ -8671 +8671 @@
           <UML:Stereotype.baseClass >CallEvent</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_916765_528' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_508113_530' >
               <UML:ModelElement.name >Destroy is a stereotyped call event denoting that the instance receiving the event is being destroyed.</UML:ModelElement.name>
             </UML:Comment>
@@ -8683 +8683 @@
           <UML:Stereotype.baseClass >Comment</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_578921_529' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_393613_531' >
               <UML:ModelElement.name >Specifies a contract or an obligation of an element in its relationship Comment to other elements.</UML:ModelElement.name>
             </UML:Comment>
@@ -8695 +8695 @@
           <UML:Stereotype.baseClass >Artifact</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_974601_530' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_856078_532' >
               <UML:ModelElement.name >Denotes a database table.</UML:ModelElement.name>
             </UML:Comment>
@@ -8707 +8707 @@
           <UML:Stereotype.baseClass >Component</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_540191_531' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_901334_533' >
               <UML:ModelElement.name >Denotes a document containing source code or data.</UML:ModelElement.name>
             </UML:Comment>
@@ -8719 +8719 @@
           <UML:Stereotype.baseClass >Constraint</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_650901_532' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_995685_534' >
               <UML:ModelElement.name >Specifies a constraint that must be attached to an operation, and denotes that the conditions of the constraint must hold after the invocation of the operation.</UML:ModelElement.name>
             </UML:Comment>
@@ -8731 +8731 @@
           <UML:Stereotype.baseClass >AssociationEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_272233_533' >
+            <UML:Comment xmi.id = 'nicklas_1145341543640_910909_535' >
               <UML:ModelElement.name >Specifies that the relationship represents a procedure parameter rather than AssociationEnd an actual association.</UML:ModelElement.name>
             </UML:Comment>
@@ -8743 +8743 @@
           <UML:Stereotype.baseClass >Comment</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943175_714725_534' >
+            <UML:Comment xmi.id = 'nicklas_1145341543641_156905_536' >
               <UML:ModelElement.name >Specifies a desired feature, property, or behavior of an element as part Comment of a system.</UML:ModelElement.name>
             </UML:Comment>
@@ -8755 +8755 @@
           <UML:Stereotype.baseClass >Model</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943176_139343_535' >
+            <UML:Comment xmi.id = 'nicklas_1145341543641_521546_537' >
               <UML:ModelElement.name >A use case model specifies the services a system provides to its users; that is, the different ways of using the system, and whose top-level package is a use case system.</UML:ModelElement.name>
             </UML:Comment>
@@ -8767 +8767 @@
           <UML:Stereotype.baseClass >LinkEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943176_26852_536' >
+            <UML:Comment xmi.id = 'nicklas_1145341543641_959106_538' >
               <UML:ModelElement.name > Local is a constraint applied to a link-end, specifying that the corresponding instance is visible because it is in a local scope relative to the link.</UML:ModelElement.name>
             </UML:Comment>
@@ -8779 +8779 @@
           <UML:Stereotype.baseClass >Dependency</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943176_816202_537' >
+            <UML:Comment xmi.id = 'nicklas_1145341543641_906468_539' >
               <UML:ModelElement.name >This dependency means that the supplier package is being used as a model library associated with a profile. The client is a package that is stereotyped as a profile and the supplier is a non-profile package that contains shared model elements, such as classes and data types.</UML:ModelElement.name>
             </UML:Comment>
@@ -8791 +8791 @@
           <UML:Stereotype.baseClass >AssociationEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943176_210905_538' >
+            <UML:Comment xmi.id = 'nicklas_1145341543641_688736_540' >
               <UML:ModelElement.name > Specifies that the target is a global value that is known to all elements AssociationEnd rather than an actual association.</UML:ModelElement.name>
             </UML:Comment>
@@ -8803 +8803 @@
           <UML:Stereotype.baseClass >Model</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943176_365578_539' >
+            <UML:Comment xmi.id = 'nicklas_1145341543642_491726_541' >
               <UML:ModelElement.name >A metamodel is a stereotyped model denoting that the model is an abstraction of another model, i.e., it is a model of a model. Hence, if M2 is a model of the model M1, then M2 is a metamodel of M1. It follows then that classes in M1 are instances of metaclasses in M2. The stereotype can be recursively applied, as in the case of a 4-layer metamodel architecture.</UML:ModelElement.name>
             </UML:Comment>
@@ -8857 +8857 @@
           <UML:Stereotype.baseClass >Constraint</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943177_658866_540' >
+            <UML:Comment xmi.id = 'nicklas_1145341543652_879301_542' >
               <UML:ModelElement.name > Specifies a constraint that must be attached to an operation, and denotes that the conditions of the constraint must hold for the invocation of the operation.</UML:ModelElement.name>
             </UML:Comment>
@@ -8869 +8869 @@
           <UML:Stereotype.baseClass >LinkEnd</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943177_165375_541' >
+            <UML:Comment xmi.id = 'nicklas_1145341543652_862066_543' >
               <UML:ModelElement.name > Global is a constraint applied to a link-end, specifying that the corresponding instance is visible because it is in a global scope relative to the link.</UML:ModelElement.name>
             </UML:Comment>
@@ -8881 +8881 @@
           <UML:Stereotype.baseClass >Component</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943177_535934_542' >
+            <UML:Comment xmi.id = 'nicklas_1145341543653_294016_544' >
               <UML:ModelElement.name >Denotes a data base table.</UML:ModelElement.name>
             </UML:Comment>
@@ -8893 +8893 @@
           <UML:Stereotype.baseClass >Model</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943177_298753_543' >
+            <UML:Comment xmi.id = 'nicklas_1145341543653_376510_545' >
               <UML:ModelElement.name >A systemModel is a stereotyped model that contains a collection of models of the same physical system. A systemModel also contains all relationships and constraints between model elements contained in different models.</UML:ModelElement.name>
             </UML:Comment>
@@ -8905 +8905 @@
           <UML:Stereotype.baseClass >Usage</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943177_810873_544' >
+            <UML:Comment xmi.id = 'nicklas_1145341543653_672612_546' >
               <UML:ModelElement.name >«send» Usage Send is a stereotyped usage dependency whose source is an operation and whose target is a signal, specifying that the source sends the target signal.</UML:ModelElement.name>
             </UML:Comment>
@@ -8933 +8933 @@
           <UML:Stereotype.baseClass >Permission</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943178_604644_545' >
+            <UML:Comment xmi.id = 'nicklas_1145341543653_340407_547' >
               <UML:ModelElement.name >Access is a stereotyped permission dependency between two namespaces, denoting that the public contents of the target namespace are accessible to the namespace of the source package.</UML:ModelElement.name>
             </UML:Comment>
@@ -8945 +8945 @@
           <UML:Stereotype.baseClass >Component</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943178_731242_546' >
+            <UML:Comment xmi.id = 'nicklas_1145341543654_291696_548' >
               <UML:ModelElement.name >Denotes a program that may be run on a node.</UML:ModelElement.name>
             </UML:Comment>
@@ -8973 +8973 @@
           <UML:Stereotype.baseClass >Abstraction</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943178_565472_547' >
+            <UML:Comment xmi.id = 'nicklas_1145341543654_916955_549' >
               <UML:ModelElement.name >(Name for the stereotyped class is Derivation.) Specifies a derivation relationship among model elements that are usually, but not necessarily, of the same type. A derived dependency specifies that the client may be computed from the supplier. The mapping specifies the computation. The client may be implemented for design reasons, such as efficiency, even though it is logically redundant.</UML:ModelElement.name>
             </UML:Comment>
@@ -10627 +10627 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943197_397765_548' >
+            <UML:Comment xmi.id = 'nicklas_1145341543673_566320_550' >
               <UML:ModelElement.name >A control is a class whose objects manage interactions between collections of objects.
 A control class usually has behavior that is specific for one use case, and a control object usually does not outlive the use case realizations in which it participates.</UML:ModelElement.name>
@@ -10640 +10640 @@
           <UML:Stereotype.baseClass >Classifier</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943197_89002_549' >
+            <UML:Comment xmi.id = 'nicklas_1145341543673_934750_551' >
               <UML:ModelElement.name >Specifies that the instances of the classifier are classes.</UML:ModelElement.name>
             </UML:Comment>
@@ -10652 +10652 @@
           <UML:Stereotype.baseClass >Classifier</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943197_681216_550' >
+            <UML:Comment xmi.id = 'nicklas_1145341543673_418017_552' >
               <UML:ModelElement.name >Specifies that the classifier is a metaclass whose instances are siblings
 marked by the same discriminator. For example, the metaclass
@@ -10668 +10668 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_355120_551' >
+            <UML:Comment xmi.id = 'nicklas_1145341543674_914410_553' >
               <UML:ModelElement.name >Specifies a domain of objects together with the operations applicable
 to the objects, without defining the physical implementation of those
@@ -10686 +10686 @@
           <UML:Stereotype.baseClass >Classifier</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_134543_552' >
+            <UML:Comment xmi.id = 'nicklas_1145341543674_796294_554' >
               <UML:ModelElement.name >Classifier Specifies a classifier that represents a flow of control.</UML:ModelElement.name>
             </UML:Comment>
@@ -10698 +10698 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_657011_553' >
+            <UML:Comment xmi.id = 'nicklas_1145341543674_192984_555' >
               <UML:ModelElement.name >An entity is a passive class; that is, its objects do not initiate interactions on their own. An entity object may participate in many different use case realizations and usually outlives any single interaction.</UML:ModelElement.name>
             </UML:Comment>
@@ -10710 +10710 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_451270_554' >
+            <UML:Comment xmi.id = 'nicklas_1145341543674_676849_556' >
               <UML:ModelElement.name >Specifies a class that defines the core logic or control flow for one or more auxiliary classes that support it. Support classes may be defined explicitly using Auxiliary classes or implicitly by dependency relationships. Focus classes are typically used together with one or more Auxiliary classes, and are particularly useful for specifying the core business logic or control flow of components during design. See also: «auxiliary».</UML:ModelElement.name>
             </UML:Comment>
@@ -10722 +10722 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_308995_555' >
+            <UML:Comment xmi.id = 'nicklas_1145341543675_56743_557' >
               <UML:ModelElement.name >Specifies a class that supports another more central or fundamental
 class, typically by implementing secondary logic or control flow. The
@@ -10740 +10740 @@
           <UML:Stereotype.baseClass >Classifier</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_530752_556' >
+            <UML:Comment xmi.id = 'nicklas_1145341543675_696379_558' >
               <UML:ModelElement.name >Specifies a classifier that represents a heavy-weight flow of control.</UML:ModelElement.name>
             </UML:Comment>
@@ -10752 +10752 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943198_537531_557' >
+            <UML:Comment xmi.id = 'nicklas_1145341543675_528392_559' >
               <UML:ModelElement.name >A boundary is a class that lies on the periphery of a system, but within it. It interacts with actors outside the system as well as with entity, control, and other boundary classes within the system.</UML:ModelElement.name>
             </UML:Comment>
@@ -10764 +10764 @@
           <UML:Stereotype.baseClass >Classifier</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943199_156705_558' >
+            <UML:Comment xmi.id = 'nicklas_1145341543675_712637_560' >
               <UML:ModelElement.name >Specifies a classifier that has no instances, but rather denotes a named collection of non-member attributes and operations, all of which are class-scoped.</UML:ModelElement.name>
             </UML:Comment>
@@ -10776 +10776 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943199_963140_559' >
+            <UML:Comment xmi.id = 'nicklas_1145341543676_512159_561' >
               <UML:ModelElement.name >Specifies the implementation of a class in some programming
 language (for example, C++, Smalltalk, Java) in which an instance
@@ -10801 +10801 @@
           <UML:Stereotype.baseClass >ModelClass</UML:Stereotype.baseClass>
           <UML:ModelElement.comment >
-            <UML:Comment xmi.id = 'nicklas_1143100943199_455940_560' >
+            <UML:Comment xmi.id = 'nicklas_1145341543676_406365_562' >
               <UML:ModelElement.name >Specifies the implementation of a class in some programming Class language in which an instance may not have more than one class. This is in contrast to a general UML Class, for which an instance may have multiple classes at one time and may gain or lose classes over time, and an object (a child of instance) may dynamically have  multiple classes.</UML:ModelElement.name>
             </UML:Comment>
@@ -23401 +23401 @@
                 <UML:Classifier xmi.idref = 'nicklas_1143100356092_382980_435' />
               </UML:AssociationEnd.participant>     <!-- FormulaExpression -->
+            </UML:AssociationEnd>
+          </UML:Association.connection>
+        </UML:Association>
+        <UML:Association xmi.id = 'nicklas_1145341486308_131572_460' >
+          <UML:GeneralizableElement.isRoot xmi.value = 'false' />
+          <UML:GeneralizableElement.isLeaf xmi.value = 'false' />
+          <UML:GeneralizableElement.isAbstract xmi.value = 'false' />
+          <UML:Association.connection >
+            <UML:AssociationEnd xmi.id = 'nicklas_1145341486307_971567_458' >
+              <UML:ModelElement.name >experiments</UML:ModelElement.name>
+              <UML:ModelElement.visibility xmi.value = 'private' />
+              <UML:AssociationEnd.isNavigable xmi.value = 'true' />
+              <UML:AssociationEnd.ordering xmi.value = 'unordered' />
+              <UML:AssociationEnd.aggregation xmi.value = 'none' />
+              <UML:AssociationEnd.targetScope xmi.value = 'instance' />
+              <UML:AssociationEnd.multiplicity >
+                <UML:Multiplicity xmi.id = 'nicklas_1145342142673_490479_567' >
+                  <UML:Multiplicity.range >
+                    <UML:MultiplicityRange xmi.id = 'nicklas_1145342142673_283171_568' >
+                      <UML:MultiplicityRange.lower >0</UML:MultiplicityRange.lower>
+                      <UML:MultiplicityRange.upper >*</UML:MultiplicityRange.upper>
+                    </UML:MultiplicityRange>
+                  </UML:Multiplicity.range>
+                </UML:Multiplicity>
+              </UML:AssociationEnd.multiplicity>
+              <UML:AssociationEnd.changeability xmi.value = 'changeable' />
+              <UML:AssociationEnd.association >
+                <UML:Association xmi.idref = 'nicklas_1145341486308_131572_460' />
+              </UML:AssociationEnd.association>     <!--  -->
+              <UML:AssociationEnd.participant >
+                <UML:Classifier xmi.idref = 'nicklas_1127222919391_682883_327' />
+              </UML:AssociationEnd.participant>     <!-- ExperimentData -->
+            </UML:AssociationEnd>
+            <UML:AssociationEnd xmi.id = 'nicklas_1145341486308_238675_459' >
+              <UML:ModelElement.name >experimentalFactors</UML:ModelElement.name>
+              <UML:ModelElement.visibility xmi.value = 'public' />
+              <UML:AssociationEnd.isNavigable xmi.value = 'true' />
+              <UML:AssociationEnd.ordering xmi.value = 'unordered' />
+              <UML:AssociationEnd.aggregation xmi.value = 'none' />
+              <UML:AssociationEnd.targetScope xmi.value = 'instance' />
+              <UML:AssociationEnd.multiplicity >
+                <UML:Multiplicity xmi.id = 'nicklas_1145341543886_515243_565' >
+                  <UML:Multiplicity.range >
+                    <UML:MultiplicityRange xmi.id = 'nicklas_1145341543886_863843_566' >
+                      <UML:MultiplicityRange.lower >0</UML:MultiplicityRange.lower>
+                      <UML:MultiplicityRange.upper >*</UML:MultiplicityRange.upper>
+                    </UML:MultiplicityRange>
+                  </UML:Multiplicity.range>
+                </UML:Multiplicity>
+              </UML:AssociationEnd.multiplicity>
+              <UML:AssociationEnd.changeability xmi.value = 'changeable' />
+              <UML:AssociationEnd.association >
+                <UML:Association xmi.idref = 'nicklas_1145341486308_131572_460' />
+              </UML:AssociationEnd.association>     <!--  -->
+              <UML:AssociationEnd.participant >
+                <UML:Classifier xmi.idref = 'nicklas_1117789464231_29393_165' />
+              </UML:AssociationEnd.participant>     <!-- AnnotationTypeData -->
             </UML:AssociationEnd>
           </UML:Association.connection>
@@ -24899 +24956 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '10' />
           <diagramScrollPositionY xmi.value = '150' />
@@ -26028 +26085 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '10' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -27518 +27575 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -28545 +28602 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '60' />
@@ -29274 +29331 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -29630 +29687 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -29816 +29873 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '10' />
@@ -30052 +30109 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -30360 +30417 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -30742 +30799 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '10' />
@@ -31593 +31650 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -31695 +31752 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -33330 +33387 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '23' />
@@ -34138 +34195 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '90' />
@@ -34878 +34935 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -35900 +35957 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
           <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
@@ -37735 +37792 @@
           <diagramOpened xmi.value = 'true' />
           <diagramWindowType >ClassDiagramWindow</diagramWindowType>
-          <diagramWindowBounds >0, 0, 915, 801</diagramWindowBounds>
-          <diagramScrollPositionX xmi.value = '156' />
+          <diagramWindowBounds >0, 0, 916, 801</diagramWindowBounds>
+          <diagramScrollPositionX xmi.value = '0' />
           <diagramScrollPositionY xmi.value = '0' />
           <maximized xmi.value = 'true' />
@@ -37782 +37839 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >186, 6, 22, 11</geometry>
+                  <geometry >186, 5, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223048039_982323_517' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >184, 37, 26, 13</geometry>
+                  <geometry >184, 38, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223048039_690263_519' >
@@ -37859 +37916 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >337, 62, 22, 11</geometry>
+                  <geometry >337, 60, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223427510_342009_587' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >335, 91, 26, 13</geometry>
+                  <geometry >335, 93, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223427510_564294_589' >
@@ -37935 +37992 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >335, 186, 22, 11</geometry>
+                  <geometry >319, 170, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223461853_882230_618' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >311, 161, 26, 13</geometry>
+                  <geometry >317, 203, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223461853_556966_620' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >312, 150, 22, 11</geometry>
+                  <geometry >319, 214, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1127223461853_5321_622' >
@@ -37961 +38018 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223461853_987859_627' >
                       <visible xmi.value = 'false' />
-                      <geometry >465, 195, 22, 11</geometry>
+                      <geometry >449, 243, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -37991 +38048 @@
                 <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1127223461854_84508_640' >
                   <visible xmi.value = 'false' />
-                  <geometry >318, 186, 33, 11</geometry>
+                  <geometry >314, 181, 33, 11</geometry>
                 </mdElement>
               </mdOwnedViews>
@@ -38011 +38068 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >495, 158, 22, 11</geometry>
+                  <geometry >495, 150, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223559976_905203_674' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >493, 177, 26, 13</geometry>
+                  <geometry >493, 183, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223559976_171663_676' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >495, 184, 22, 11</geometry>
+                  <geometry >495, 194, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1127223559976_861950_678' >
@@ -38058 +38115 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223559976_963283_692' >
                       <visible xmi.value = 'false' />
-                      <geometry >500, 166, 22, 11</geometry>
+                      <geometry >516, 161, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -38067 +38124 @@
                 <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1127223559976_70832_696' >
                   <visible xmi.value = 'false' />
-                  <geometry >490, 164, 33, 11</geometry>
+                  <geometry >490, 161, 33, 11</geometry>
                 </mdElement>
               </mdOwnedViews>
@@ -38087 +38144 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >559, 159, 22, 11</geometry>
+                  <geometry >559, 150, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223722102_895695_848' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >557, 175, 26, 13</geometry>
+                  <geometry >557, 183, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223722102_856744_850' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >559, 181, 22, 11</geometry>
+                  <geometry >559, 194, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1127223722102_17175_852' >
@@ -38134 +38191 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223722103_92582_866' >
                       <visible xmi.value = 'false' />
-                      <geometry >575, 221, 22, 11</geometry>
+                      <geometry >580, 173, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -38143 +38200 @@
                 <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1127223722103_246320_870' >
                   <visible xmi.value = 'false' />
-                  <geometry >554, 164, 33, 11</geometry>
+                  <geometry >554, 161, 33, 11</geometry>
                 </mdElement>
               </mdOwnedViews>
@@ -38163 +38220 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >457, 7, 22, 11</geometry>
+                  <geometry >457, 6, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223780742_736861_879' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >455, 38, 26, 13</geometry>
+                  <geometry >455, 39, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127223780742_773780_881' >
@@ -38258 +38315 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >567, 16, 22, 11</geometry>
+                  <geometry >566, 13, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127224126223_983061_934' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >555, 33, 26, 13</geometry>
+                  <geometry >564, 46, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127224126223_195579_936' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >560, 56, 22, 11</geometry>
+                  <geometry >566, 57, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1127224126224_900846_938' >
@@ -38314 +38371 @@
                 <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1127224126224_545945_956' >
                   <visible xmi.value = 'false' />
-                  <geometry >562, 28, 33, 11</geometry>
+                  <geometry >561, 24, 33, 11</geometry>
                 </mdElement>
               </mdOwnedViews>
@@ -39568 +39625 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127893568535_934734_882' >
                       <visible xmi.value = 'false' />
-                      <geometry >514, 313, 22, 11</geometry>
+                      <geometry >535, 313, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127893568535_390889_884' >
@@ -39644 +39701 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127893586720_478749_913' >
                       <visible xmi.value = 'false' />
-                      <geometry >560, 313, 22, 11</geometry>
+                      <geometry >581, 313, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1127893586720_365964_915' >
@@ -40755 +40812 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >764, 248, 22, 11</geometry>
+                  <geometry >764, 246, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1128084809797_703145_986' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >762, 278, 26, 13</geometry>
+                  <geometry >762, 279, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1128084809797_111270_988' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >764, 289, 22, 11</geometry>
+                  <geometry >764, 290, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1128084809797_433293_990' >
@@ -40773 +40830 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1128084809797_883831_991' >
                       <visible xmi.value = 'false' />
-                      <geometry >743, 279, 22, 11</geometry>
+                      <geometry >764, 279, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1128084809797_103651_993' >
@@ -40923 +40980 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >331, 254, 26, 13</geometry>
+                  <geometry >331, 255, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1130916331694_317707_622' >
@@ -40936 +40993 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1130916331694_155655_625' >
                       <visible xmi.value = 'false' />
-                      <geometry >428, 223, 22, 11</geometry>
+                      <geometry >449, 223, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1130916331694_586306_627' >
                       <visible xmi.value = 'false' />
-                      <geometry >428, 254, 22, 11</geometry>
+                      <geometry >449, 254, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1130916331694_935485_629' >
                       <visible xmi.value = 'false' />
-                      <geometry >428, 265, 22, 11</geometry>
+                      <geometry >449, 265, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -41023 +41080 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1131020598062_994191_422' >
                       <visible xmi.value = 'false' />
-                      <geometry >318, 367, 22, 11</geometry>
+                      <geometry >339, 367, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1131020598062_868566_424' >
                       <visible xmi.value = 'false' />
-                      <geometry >318, 398, 22, 11</geometry>
+                      <geometry >339, 398, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1131020598062_21733_426' >
                       <visible xmi.value = 'false' />
-                      <geometry >318, 409, 22, 11</geometry>
+                      <geometry >339, 409, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -41247 +41304 @@
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >733, 147, 22, 11</geometry>
+                  <geometry >733, 130, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1143100423406_209015_459' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >708, 131, 26, 13</geometry>
+                  <geometry >731, 163, 26, 13</geometry>
                 </mdElement>
                 <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1143100423406_581859_461' >
                   <editable xmi.value = 'false' />
                   <visible xmi.value = 'false' />
-                  <geometry >709, 132, 22, 11</geometry>
+                  <geometry >733, 174, 22, 11</geometry>
                 </mdElement>
                 <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1143100423406_262706_463' >
@@ -41265 +41322 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1143100423406_493947_464' >
                       <visible xmi.value = 'false' />
-                      <geometry >694, 134, 22, 11</geometry>
+                      <geometry >715, 134, 22, 11</geometry>
                     </mdElement>
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1143100423406_832924_466' >
@@ -41294 +41351 @@
                     <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1143100423406_262824_477' >
                       <visible xmi.value = 'false' />
-                      <geometry >795, 125, 22, 11</geometry>
+                      <geometry >779, 173, 22, 11</geometry>
                     </mdElement>
                   </mdOwnedViews>
@@ -41303 +41360 @@
                 <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1143100423406_614619_481' >
                   <visible xmi.value = 'false' />
-                  <geometry >728, 147, 33, 11</geometry>
+                  <geometry >728, 141, 33, 11</geometry>
                 </mdElement>
               </mdOwnedViews>
@@ -41311 +41368 @@
               <associationFirstEndID xmi.idref = 'nicklas_1143100423406_262706_463' />
               <associationSecondEndID xmi.idref = 'nicklas_1143100423406_539905_472' />
+            </mdElement>
+            <mdElement elementClass = 'ClassView' xmi.id = 'nicklas_1145341437468_822646_436' >
+              <elementID xmi.idref = 'nicklas_1117789464231_29393_165' />
+              <properties >
+                <mdElement elementClass = 'ColorProperty' >
+                  <propertyID >FILL_COLOR</propertyID>
+                  <value xmi.value = '-1' />
+                </mdElement>
+                <mdElement elementClass = 'BooleanProperty' >
+                  <propertyID >SHOW_STEREOTYPE</propertyID>
+                  <value xmi.value = 'false' />
+                </mdElement>
+                <mdElement elementClass = 'BooleanProperty' >
+                  <propertyID >SHOW_TAGGED_VALUES</propertyID>
+                  <value xmi.value = 'false' />
+                </mdElement>
+                <mdElement elementClass = 'BooleanProperty' >
+                  <propertyID >SUPPRESS_CLASS_ATTRIBUTES</propertyID>
+                  <value xmi.value = 'true' />
+                </mdElement>
+              </properties>
+              <geometry >20, 320, 114, 22</geometry>
+            </mdElement>
+            <mdElement elementClass = 'AssociationView' xmi.id = 'nicklas_1145341486309_603719_461' >
+              <elementID xmi.idref = 'nicklas_1145341486308_131572_460' />
+              <linkFirstEndID xmi.idref = 'nicklas_1127222919393_181238_328' />
+              <linkSecondEndID xmi.idref = 'nicklas_1145341437468_822646_436' />
+              <geometry >80, 158; 48, 158; 48, 320; </geometry>
+              <linkNameID xmi.idref = 'nicklas_1145341486309_102642_486' />
+              <nameVisible xmi.value = 'true' />
+              <mdOwnedViews >
+                <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_2041_462' >
+                  <editable xmi.value = 'false' />
+                  <visible xmi.value = 'false' />
+                  <geometry >37, 214, 22, 11</geometry>
+                </mdElement>
+                <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_405488_464' >
+                  <editable xmi.value = 'false' />
+                  <visible xmi.value = 'false' />
+                  <geometry >35, 232, 26, 13</geometry>
+                </mdElement>
+                <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_832666_466' >
+                  <editable xmi.value = 'false' />
+                  <visible xmi.value = 'false' />
+                  <geometry >37, 239, 22, 11</geometry>
+                </mdElement>
+                <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1145341486309_193942_468' >
+                  <elementID xmi.idref = 'nicklas_1145341486307_971567_458' />
+                  <geometry >70, 153, 10, 10</geometry>
+                  <mdOwnedViews >
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_904990_469' >
+                      <geometry >10, 145, 68, 11</geometry>
+                      <text >-experiments</text>
+                    </mdElement>
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_802522_471' >
+                      <geometry >55, 160, 22, 11</geometry>
+                      <text >0..*</text>
+                    </mdElement>
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_963054_473' >
+                      <visible xmi.value = 'false' />
+                      <geometry >48, 179, 22, 11</geometry>
+                    </mdElement>
+                  </mdOwnedViews>
+                  <roleNameID xmi.idref = 'nicklas_1145341486309_904990_469' />
+                  <roleMultiplicityID xmi.idref = 'nicklas_1145341486309_802522_471' />
+                  <roleConstraintsID xmi.idref = 'nicklas_1145341486309_963054_473' />
+                </mdElement>
+                <mdElement elementClass = 'RoleView' xmi.id = 'nicklas_1145341486309_687601_477' >
+                  <elementID xmi.idref = 'nicklas_1145341486308_238675_459' />
+                  <geometry >43, 310, 10, 10</geometry>
+                  <mdOwnedViews >
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_876163_478' >
+                      <geometry >17, 305, 109, 11</geometry>
+                      <text >+experimentalFactors</text>
+                    </mdElement>
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_683668_480' >
+                      <geometry >22, 290, 22, 11</geometry>
+                      <text >0..*</text>
+                    </mdElement>
+                    <mdElement elementClass = 'TextBoxView' xmi.id = 'nicklas_1145341486309_920023_482' >
+                      <visible xmi.value = 'false' />
+                      <geometry >58, 288, 22, 11</geometry>
+                    </mdElement>
+                  </mdOwnedViews>
+                  <roleNameID xmi.idref = 'nicklas_1145341486309_876163_478' />
+                  <roleMultiplicityID xmi.idref = 'nicklas_1145341486309_683668_480' />
+                  <roleConstraintsID xmi.idref = 'nicklas_1145341486309_920023_482' />
+                </mdElement>
+                <mdElement elementClass = 'AssociationTextBoxView' xmi.id = 'nicklas_1145341486309_102642_486' >
+                  <visible xmi.value = 'false' />
+                  <geometry >32, 214, 33, 11</geometry>
+                </mdElement>
+              </mdOwnedViews>
+              <linkConstraintID xmi.idref = 'nicklas_1145341486309_2041_462' />
+              <linkStereotypeID xmi.idref = 'nicklas_1145341486309_405488_464' />
+              <linkTaggedValuesID xmi.idref = 'nicklas_1145341486309_832666_466' />
+              <associationFirstEndID xmi.idref = 'nicklas_1145341486309_193942_468' />
+              <associationSecondEndID xmi.idref = 'nicklas_1145341486309_687601_477' />
             </mdElement>
           </mdOwnedViews>
@@ -41322 +41477 @@
       <favoriteElements xmi.value = '' />
       <browserVisible xmi.value = 'true' />
-      <browserBounds >1, 1, 345, 860</browserBounds>
+      <browserBounds >1, 1, 344, 860</browserBounds>
       <browserDividerLocation xmi.value = '550' />
     </options>

trunk/src/core/common-queries.xml

@@ -962 +962 @@
     </description>
   </query>
+  
+  <query id="COUNT_EXPERIMENTS_FOR_ANNOTATIONTYPE" type="HQL">
+    <sql>
+      SELECT count(*)
+      FROM ExperimentData exp
+      JOIN exp.experimentalFactors ef
+      WHERE ef = :annotationType
+    </sql>
+    <description>
+      A Hibernate query that counts the number of experiments
+      where the given annotation type is used as an experimental factor.
+    </description>
+  </query>
 
   <query id="COUNT_SAMPLES_FOR_BIOSOURCE" type="HQL">
@@ -1656 +1669 @@
   </query>
 
+  <query id="GET_PRIMARY_ANNOTATION" type="HQL">
+    <sql>
+      SELECT ad
+      FROM AnnotationData ad
+      WHERE ad.annotationType = :annotationType
+      AND ad.annotationSet = :annotationSet
+    </sql>
+    <description>
+      A Hibernate query that loads the primary annotation of a specific
+      annotation type for a given annotation set.
+    </description>
+  </query>
+  
+  <query id="GET_DIRECTLY_INHERITED_ANNOTATION" type="HQL">
+    <sql>
+      SELECT ad 
+      FROM AnnotationData ad
+      JOIN ad.inheritingSets ans
+      WHERE ad.annotationType = :annotationType
+      AND ans = :annotationSet
+    </sql>
+    <description>
+      A Hibernate query that loads an directly inherited annotation of a specific
+      annotation type for a given annotation set. A directly inhertited annotation
+      is an annotation that is linked to the specified annotation set.
+    </description>
+  </query>
+
+  <query id="GET_INDIRECTLY_INHERITED_ANNOTATION" type="HQL">
+    <sql>
+      SELECT ad
+      FROM AnnotationData ad
+      JOIN ad.annotationSet.inheritingSets ians
+      WHERE ad.annotationType = :annotationType
+      AND ians = :annotationSet
+    </sql>
+    <description>
+      A Hibernate query that loads an indirectly inherited annotation of a specific
+      annotation type for a given annotation set. An indirectly inhertied annotation
+      is an annotation which belongs to an annotation set which is inhertited by 
+      the given annotation set.
+    </description>
+  </query>
+
 </predefined-queries>

trunk/src/core/net/sf/basedb/core/AnnotationSet.java

@@ -28 +28 @@
 import net.sf.basedb.core.query.Hql;
 
+import net.sf.basedb.core.data.AnnotationData;
 import net.sf.basedb.core.data.AnnotationSetData;
 
@@ -205 +206 @@
       and the annotation type isn't valid for this type of item
     @throws BaseException If there is another error
+    @see #findAnnotation(AnnotationType)
   */
   public Annotation getAnnotation(AnnotationType annotationType)
@@ -239 +241 @@
 
   /**
+    Find an annotation of the specified annotation type among all annotations
+    including the inherted annotations. This method will first search for the
+    annotation in the following order:
+    <ol>
+    <li>The primary annotations
+    <li>The inherited annotations
+    <li>The inherited annotation sets
+    </ol>
+    If no annotation of the specified type is found, null is returned.
+    If more than one annotation of the specified type exists only the first
+    one found is returned.
+    
+    @param annotationType The annotation type to look for
+    @return An <code>Annotation</code> object or null
+   */
+  public Annotation findAnnotation(AnnotationType annotationType)
+    throws PermissionDeniedException
+  {
+    if (annotationType == null) throw new InvalidUseOfNullException("annotationType");
+    
+    Annotation a = null;
+    AnnotationData ad = null;
+    
+    org.hibernate.Session session = getDbControl().getHibernateSession();
+    
+    // Find primary annotation
+    org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "GET_PRIMARY_ANNOTATION");
+    /*
+      SELECT ad
+      FROM AnnotationData ad
+      WHERE ad.annotationType = :annotationType
+      AND ad.annotationSet = :annotationSet
+    */
+    query.setEntity("annotationType", annotationType.getData());
+    query.setEntity("annotationSet", this.getData());
+    ad = HibernateUtil.loadData(AnnotationData.class, query);
+    
+    if (ad == null)
+    {
+      // Find inherited
+      query = HibernateUtil.getPredefinedQuery(session, "GET_DIRECTLY_INHERITED_ANNOTATION");
+      /*
+        SELECT ad 
+        FROM AnnotationData ad
+        JOIN ad.inheritingSets ans
+        WHERE ad.annotationType = :annotationType
+        AND ans = :annotationSet
+      */
+      query.setEntity("annotationType", annotationType.getData());
+      query.setEntity("annotationSet", this.getData());
+      ad = HibernateUtil.loadData(AnnotationData.class, query);
+    }
+
+    if (ad == null)
+    {
+      // Find among inherited annotation sets
+      query = HibernateUtil.getPredefinedQuery(session, "GET_INDIRECTLY_INHERITED_ANNOTATION");
+      /*
+        SELECT ad
+        FROM AnnotationData ad
+        JOIN ad.annotationSet.inheritingSets ians
+        WHERE ad.annotationType = :annotationType
+        AND ians = :annotationSet
+      */
+      query.setEntity("annotationType", annotationType.getData());
+      query.setEntity("annotationSet", this.getData());
+      ad = HibernateUtil.loadData(AnnotationData.class, query);
+    }
+    
+    if (ad != null)
+    {
+      a = getDbControl().getItem(Annotation.class, ad);
+    }
+    return a;
+  }
+  
+  /**
     Delete the annotation of the specified annotation type.
     @param annotationType The type of the annotation to delete
@@ -260 +339 @@
   
   /**
-    Get a query that reurns all direct annotations in this annotation
+    Get a query that reurns all primary annotations in this annotation
     set.
     @return An <code>ItemQuery</code> object

trunk/src/core/net/sf/basedb/core/AnnotationType.java

@@ -160 +160 @@
   {
     org.hibernate.Session session = getDbControl().getHibernateSession();
-    org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "COUNT_ANNOTATIONS_FOR_ANNOTATIONTYPE");
-    /*
-      SELECT count(*)
-      FROM AnnotationData a
-      WHERE a.annotationType = :annotationType
-    */
-    query.setEntity("annotationType", this.getData());
-    return HibernateUtil.loadData(Integer.class, query) > 0;
+    boolean used = false;
+  
+    if (!used)
+    {
+      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "COUNT_ANNOTATIONS_FOR_ANNOTATIONTYPE");
+      /*
+        SELECT count(*)
+        FROM AnnotationData a
+        WHERE a.annotationType = :annotationType
+      */
+      query.setEntity("annotationType", this.getData());
+      used = HibernateUtil.loadData(Integer.class, query) > 0;
+    }
+    if (!used)
+    {
+      org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "COUNT_EXPERIMENTS_FOR_ANNOTATIONTYPE");
+      /*
+        SELECT count(*)
+        FROM ExperimentData exp
+        JOIN exp.experimentalFactors ef
+        WHERE ef = :annotationType
+      */
+      query.setEntity("annotationType", this.getData());
+      used = HibernateUtil.loadData(Integer.class, query) > 0;
+    }
+    return used;
   }
   // -------------------------------------------

trunk/src/core/net/sf/basedb/core/Experiment.java

@@ -581 +581 @@
   }
   
+  
+  /**
+    Add an annotation type as an experimental factor to this experiment. 
+    @param annotationType The annotation type to add to this experiment
+    @throws PermissionDeniedException If the
+      logged in user doesn't have {@link Permission#WRITE}
+      permission for the experiment and {@link Permission#USE}
+      for the annotation type
+    @throws InvalidDataException If the annotationType is null
+  */
+  public void addExperimentalFactor(AnnotationType annotationType)
+    throws PermissionDeniedException, InvalidDataException
+  {
+    checkPermission(Permission.WRITE);
+    if (annotationType == null) throw new InvalidUseOfNullException("annotationType");
+    annotationType.checkPermission(Permission.USE);
+    getData().getExperimentalFactors().add(annotationType.getData());
+  }
+  
+  /**
+    Remove an annotation type from the experimental factors for this experiment.
+    @param annotationType The annotation type to remove from this experiment
+    @throws PermissionDeniedException If the
+      logged in user doesn't have {@link Permission#WRITE}
+      permission for the experiment
+    @throws InvalidDataException If the annotationType is null
+  */
+  public void removeExperimentalFactor(AnnotationType annotationType)
+    throws PermissionDeniedException, InvalidDataException
+  {
+    checkPermission(Permission.WRITE);
+    if (annotationType == null) throw new InvalidUseOfNullException("annotationType");
+    getData().getExperimentalFactors().remove(annotationType.getData());
+  }
+
+  
+  /**
+    Get a query that returns all annotation types used as experimental factors
+    for this experiment.
+    @return An <code>ItemQuery</code> object
+   */
+  public ItemQuery<AnnotationType> getExperimentalFactors()
+  {
+    ItemQuery<AnnotationType> query = AnnotationType.getQuery(null);
+    query.joinPermanent(Hql.innerJoin("experiments", Item.EXPERIMENT.getAlias()));
+    query.restrictPermanent(
+      Restrictions.eq(
+        Hql.alias(Item.EXPERIMENT.getAlias()), 
+        Hql.entity(this)
+      )
+    );
+    return query;
+  }
 }

trunk/src/core/net/sf/basedb/core/Install.java

@@ -93 +93 @@
     method.
   */
-  private static final int NEW_SCHEMA_VERSION = 2;
+  private static final int NEW_SCHEMA_VERSION = 3;
 
   public static synchronized void createTables(boolean update, final ProgressReporter progress)
@@ -1771 +1771 @@
       if (pd != null)
       {
-        pd.loadPluginInformation(className, jarPath);
+        pd.loadPluginInformation(jarPath, className);
         dc.commit();
         log.info("createPluginDefinition: UPDATED [className="+className+"; jarPath="+jarPath+"]");

trunk/src/core/net/sf/basedb/core/Update.java

@@ -51 +51 @@
     </td>
   </tr>
+  
+  <tr>
+    <td>3</td>
+    <td>
+      <ul>
+      <li>Added {@link ExperimentData#getExperimentalFactors()}. 
+        No need to update existing values.
+      </ul>
+    </td>
+  </tr>
   </table>
 
@@ -81 +91 @@
     throws BaseException
   {
-    final int total_progress_steps = 2;
+    final int total_progress_steps = 3;
     final float progress_factor = 100 / total_progress_steps;
     if (progress != null) progress.display(0, "Updating database...");
@@ -105 +115 @@
       }
 
+      if (schemaVersion < 3)
+      {
+        if (progress != null) progress.display((int)(2*progress_factor), "--Updating to schema version 3...");
+        setSchemaVersionInTransaction(3);
+      }
+      
       /*
-      if (schemaVersion < 3)
-      {
-        schemaVersion = updateToSchemaVersion3();
+      if (schemaVersion < 4)
+      {
+        schemaVersion = updateToSchemaVersion4();
+        - or -
+        setSchemaVersionInTransaction(4);
       }
       ... etc... 
@@ -164 +182 @@
   {
     org.hibernate.Query query = HibernateUtil.getPredefinedQuery(session, "SET_SCHEMA_VERSION");
-    query.setInteger("schemaVersion", 2);
+    query.setInteger("schemaVersion", schemaVersion);
     query.setInteger("build", Application.getBuild());
     HibernateUtil.executeUpdate(query);
+  }
+  
+  /**
+    Update the schema version version number using a new transaction.
+    @param schemaVersion The new schema version number
+   */
+  private static void setSchemaVersionInTransaction(int schemaVersion)
+  {
+    org.hibernate.Transaction tx = null;
+    try
+    {
+      tx = HibernateUtil.newTransaction(session);
+      setSchemaVersion(schemaVersion);
+      HibernateUtil.commit(tx);
+    }
+    catch (BaseException ex)
+    {
+      if (tx != null) HibernateUtil.rollback(tx); 
+      log.error("setSchemaVersion: FAILED", ex);
+      throw ex;
+    }
   }
   

trunk/src/core/net/sf/basedb/core/data/AnnotationTypeData.java

@@ -205 +205 @@
   }
 
+  private Set<ExperimentData> experiments;
+  /**
+    This is the inverse end.
+    @see ExperimentData#getExperimentalFactors()
+    @hibernate.set table="`ExperimentalFactors`" lazy="true" inverse="true"
+    @hibernate.collection-key column="`annotationtype_id`"
+    @hibernate.collection-many-to-many column="`experiment_id`" class="net.sf.basedb.core.data.ExperimentData"
+  */
+  public Set<ExperimentData> getExperiments()
+  {
+    return experiments;
+  }
+  void setExperiments(Set<ExperimentData> experiments)
+  {
+    this.experiments = experiments;
+  }
 }

trunk/src/core/net/sf/basedb/core/data/ExperimentData.java

@@ -282 +282 @@
   }
 
+  private Set<AnnotationTypeData> experimentalFactors;
+  /**
+    The annotation types which describes the experimental factors for this experiment.
+    @hibernate.set table="`ExperimentalFactors`" lazy="true"
+    @hibernate.collection-key column="`experiment_id`"
+    @hibernate.collection-many-to-many column="`annotationtype_id`" class="net.sf.basedb.core.data.AnnotationTypeData"
+  */
+  public Set<AnnotationTypeData> getExperimentalFactors()
+  {
+    if (experimentalFactors == null)
+    {
+      experimentalFactors = new HashSet<AnnotationTypeData>();
+    }
+    return experimentalFactors;
+  }
+  void setExperimentalFactors(Set<AnnotationTypeData> experimentalFactors)
+  {
+    this.experimentalFactors = experimentalFactors;
+  }
 }

trunk/www/views/experiments/edit_experiment.jsp

@@ -35 +35 @@
   import="net.sf.basedb.core.Experiment"
   import="net.sf.basedb.core.RawBioAssay"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.RawDataType"
   import="net.sf.basedb.core.RawDataTypes"
@@ -101 +102 @@
       return true;
     }
+    
+    // Validate the "Experimental factors" tab
+    function validateExperimentalFactors()
+    {
+      return true;
+    }
 
     // Submit the form
@@ -110 +117 @@
         frm.addedRawBioAssays.value = Link.getActionIds(1, 'R').join(',');
         frm.removedRawBioAssays.value = Link.getActionIds(-1, 'R').join(',');
+
+        frm.addedAnnotationTypes.value = Link.getActionIds(1, 'A').join(',');
+        frm.removedAnnotationTypes.value = Link.getActionIds(-1, 'A').join(',');
+        
         frm.submit();
       }
@@ -124 +135 @@
       url += '&filter:STRING:rawDataType='+rawDataType;
       url += '&filter:INT:spots=>0';
-      Main.openPopup(url, 'AddRawBioAssays', 800, 600);
+      Main.openPopup(url, 'AddRawBioAssays', 1000, 700);
     }
     function addRawBioAssayCallback(rawBioAssayId, name)
@@ -132 +143 @@
       Link.addItem(document.forms['experiment'].rawBioAssays, item);
     }
-    function removeOnClick()
+    function removeRawBioAssaysOnClick()
     {
       Link.removeSelected(document.forms['experiment'].rawBioAssays);
+    }
+    
+    function addAnnotationTypesOnClick()
+    {
+      var frm = document.forms['experiment'];
+      var ids = Link.getListIds(frm.annotationTypes, 'A');
+      var excludes = ids.join(',');
+      var url = '../../admin/annotationtypes/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectmultiple&callback=addAnnotationTypeCallback';
+      url += "&exclude="+excludes;
+      Main.openPopup(url, 'AddAnnotationTypes', 1000, 700);
+    }
+    function addAnnotationTypeCallback(annotationTypeId, name)
+    {
+      var item = Link.getItem('A', annotationTypeId);
+      if (!item) item = new Item('A', annotationTypeId, name);
+      Link.addItem(document.forms['experiment'].annotationTypes, item);
+    }
+    function removeAnnotationTypesOnClick()
+    {
+      Link.removeSelected(document.forms['experiment'].annotationTypes);
     }
 
@@ -161 +192 @@
           %>
           Link.addNewItem(rawBioAssays, new Item('R', <%=rba.getId()%>, '<%=HTML.javaScriptEncode(rba.getName())%>'));
+          <%
+        }
+        %>
+        var annotationTypes = frm.annotationTypes;
+        <%
+        ItemQuery<AnnotationType> efQuery = experiment.getExperimentalFactors();
+        efQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
+        efQuery.order(Orders.asc(Hql.property("name")));
+        ItemResultList<AnnotationType> experimentalFactors = efQuery.list(dc);
+        for (AnnotationType at : experimentalFactors)
+        {
+          %>
+          Link.addNewItem(annotationTypes, new Item('A', <%=at.getId()%>, '<%=HTML.javaScriptEncode(at.getName())%>'));
           <%
         }
@@ -251 +295 @@
               /></td></tr>
             <tr><td width="150"><base:button 
-              onclick="removeOnClick()" 
+              onclick="removeRawBioAssaysOnClick()" 
               title="Remove" 
               tooltip="Remove the selected raw bioassays"
@@ -338 +382 @@
           <a href="javascript:Main.zoom('Publication', 'experiment', 'publication')"
             title="Edit in larger window"><base:icon image="zoom.gif" /></a>
+        </td>
+      </tr>
+      </table>
+      </t:tab>
+      
+      <t:tab id="experimentalFactors" title="Experimental factors" validate="validateExperimentalFactors()">
+      <table class="form" cellspacing=0>
+
+      <tr valign="top">
+        <td class="prompt">Annotation types</td>
+        <td>
+          <table border="0" cellspacing="0" cellpadding="0">
+          <tr valign="top">
+          <td>
+            <select name="annotationTypes" size="10" multiple style="width: 20em;">
+            </select>
+            <input type="hidden" name="addedAnnotationTypes" value="">
+            <input type="hidden" name="removedAnnotationTypes" value="">
+          </td>
+          <td>
+            <table border="0">
+            <tr><td width="150"><base:button 
+              onclick="addAnnotationTypesOnClick()" 
+              title="Add annotation types&hellip;" 
+              tooltip="Add annotation types"
+              /></td></tr>
+            <tr><td width="150"><base:button 
+              onclick="removeAnnotationTypesOnClick()" 
+              title="Remove" 
+              tooltip="Remove the selected annotation types"
+            /></td></tr>
+            </table>
+          </td>
+          </tr>
+          </table>
         </td>
       </tr>

trunk/www/views/experiments/index.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.Experiment"
   import="net.sf.basedb.core.RawBioAssay"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.RawDataType"
   import="net.sf.basedb.core.RawDataTypes"
@@ -171 +172 @@
       if (rawBioAssayId != -1) experiment.addRawBioAssay(RawBioAssay.getById(dc, rawBioAssayId));
     }
+    
+    String[] removeAnnotationTypes = Values.getString(request.getParameter("removedAnnotationTypes")).split(",");
+    for (int i = 0; i < removeAnnotationTypes.length; ++i)
+    {
+      int annotationTypeId = Values.getInt(removeAnnotationTypes[i], -1);
+      if (annotationTypeId != -1) experiment.removeExperimentalFactor(AnnotationType.getById(dc, annotationTypeId));
+    }
+    
+    String[] addAnnotationTypes = Values.getString(request.getParameter("addedAnnotationTypes")).split(",");
+    for (int i = 0; i < addAnnotationTypes.length; ++i)
+    {
+      int annotationTypeId = Values.getInt(addAnnotationTypes[i], -1);
+      if (annotationTypeId != -1) experiment.addExperimentalFactor(AnnotationType.getById(dc, annotationTypeId));
+    }
 
     dc.commit();

trunk/www/views/experiments/view_experiment.jsp

@@ -34 +34 @@
   import="net.sf.basedb.core.Experiment"
   import="net.sf.basedb.core.RawBioAssay"
+  import="net.sf.basedb.core.AnnotationType"
+  import="net.sf.basedb.core.AnnotationSet"
+  import="net.sf.basedb.core.Annotation"
   import="net.sf.basedb.core.User"
   import="net.sf.basedb.core.ItemQuery"
@@ -268 +271 @@
       
       <%
+      ItemQuery<AnnotationType> efQuery = experiment.getExperimentalFactors();
+      efQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
+      efQuery.order(Orders.asc(Hql.property("name")));
+      ItemResultList<AnnotationType> experimentalFactors = efQuery.list(dc);
+      if (experimentalFactors.size() == 0)
+      {
+        %>
+        <h4>Experimental factors</h4>
+        No experimental factors has been added to this experiment 
+        (or, you don't have permission to view them).
+        <%
+      }
+      else
+      {
+        %>
+        <h4 class="docked">Experimental factors</h4>
+        <tbl:table
+          id="experimentalFactors"
+          clazz="itemlist"
+          columns="all"
+          >
+        <tbl:columndef 
+          id="name"
+          title="Name"
+        />
+        <tbl:columndef
+          id="values"
+          title="Enumeration"
+        />
+        <tbl:columndef 
+          id="description"
+          title="Description"
+        />
+        <tbl:data>
+          <tbl:columns>
+          </tbl:columns>
+          <tbl:rows>
+          <%
+          String link = "../../admin/annotationtypes/index.jsp?ID="+ID;
+          for (AnnotationType item : experimentalFactors)
+          {
+            %>
+            <tbl:row>
+              <tbl:cell column="name"><%=Base.getEncodedName(item, false, link)%></tbl:cell>
+              <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
+              <tbl:cell column="values">
+              <%=item.isEnumeration() ? 
+                HTML.encodeTags(Values.getString(item.getValues(), ", ", true)) :
+                "<i>- no -</i>"%>
+              </tbl:cell>
+            </tbl:row>
+            <%
+          }
+          %>
+          </tbl:rows>
+        </tbl:data>
+        </tbl:table>
+        <%
+      }
+      %>
+      
+      <%
       ItemQuery<RawBioAssay> rbaQuery = experiment.getRawBioAssays();
       rbaQuery.include(Include.MINE, Include.SHARED, Include.OTHERS, Include.IN_PROJECT);
@@ -297 +362 @@
           title="Description"
         />
+        <%
+        for (AnnotationType at : experimentalFactors)
+        {
+          %>
+          <tbl:columndef
+            id="<%="at"+at.getId()%>"
+            title="<%=HTML.encodeTags(at.getName())+" [EF]"%>"
+          />
+          <%
+        }
+        %>
+        
         <tbl:data>
           <tbl:columns>
@@ -305 +382 @@
           for (RawBioAssay item : rawBioAssays)
           {
+            AnnotationSet as = item.isAnnotated() ? item.getAnnotationSet() : null;
             %>
             <tbl:row>
               <tbl:cell column="name"><%=Base.getEncodedName(item, false, link)%></tbl:cell>
               <tbl:cell column="description"><%=HTML.encodeTags(item.getDescription())%></tbl:cell>
+              <%
+              for (AnnotationType at : experimentalFactors)
+              {
+                
+                String value = "<i>- none -</i>";
+                if (as != null)
+                {
+                  Annotation a = as.findAnnotation(at);
+                  if (a != null)
+                  {
+                    value = Values.getString(a.getValues(), ", ", true);
+                  }
+                }
+                %>
+                <tbl:cell column="<%="at"+at.getId()%>"><%=value%></tbl:cell>
+                <%
+              }
+              %>
             </tbl:row>
             <%