Added option to randomize the Random Number Seed

13 files changed, 170 insertions, 24 deletions

diff --git a/core/org.eclipse.stem.solvers.stochastic/model/stochastic.ecore b/core/org.eclipse.stem.solvers.stochastic/model/stochastic.ecore
index 3e881bf07..6b1ac96f1 100644
--- a/core/org.eclipse.stem.solvers.stochastic/model/stochastic.ecore
+++ b/core/org.eclipse.stem.solvers.stochastic/model/stochastic.ecore
@@ -6,5 +6,7 @@
   <eClassifiers xsi:type="ecore:EClass" name="StandardStochastic" eSuperTypes="#//Stochastic">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="seed" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ELong"
         defaultValueLiteral="17"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="RandomizeSeed" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
+        defaultValueLiteral="false"/>
   </eClassifiers>
 </ecore:EPackage>
diff --git a/core/org.eclipse.stem.solvers.stochastic/model/stochastic.genmodel b/core/org.eclipse.stem.solvers.stochastic/model/stochastic.genmodel
index 105b4a673..78ca8294b 100644
--- a/core/org.eclipse.stem.solvers.stochastic/model/stochastic.genmodel
+++ b/core/org.eclipse.stem.solvers.stochastic/model/stochastic.genmodel
@@ -12,6 +12,7 @@
     <genClasses ecoreClass="stochastic.ecore#//Stochastic"/>
     <genClasses ecoreClass="stochastic.ecore#//StandardStochastic">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute stochastic.ecore#//StandardStochastic/seed"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute stochastic.ecore#//StandardStochastic/RandomizeSeed"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>
diff --git a/core/org.eclipse.stem.solvers.stochastic/plugin.properties b/core/org.eclipse.stem.solvers.stochastic/plugin.properties
index 396c13a9a..aff8317bd 100644
--- a/core/org.eclipse.stem.solvers.stochastic/plugin.properties
+++ b/core/org.eclipse.stem.solvers.stochastic/plugin.properties
@@ -25,3 +25,4 @@ _UI_Unknown_feature = Unspecified
 dc_standard_stochastic_title=Stochastic Solver
 dc_standard_stochastic_creator=S. Edlund
 _UI_StandardStochastic_seed_feature = Seed
+_UI_StandardStochastic_RandomizeSeed_feature = Randomize Seed
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StandardStochastic.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StandardStochastic.java
index 4960203d2..050c142b2 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StandardStochastic.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StandardStochastic.java
@@ -10,10 +10,11 @@ package org.eclipse.stem.solvers.stochastic;
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.stem.solvers.stochastic.StandardStochastic#getSeed <em>Seed</em>}</li>
+ *   <li>{@link org.eclipse.stem.solvers.stochastic.StandardStochastic#isRandomizeSeed <em>Randomize Seed</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.stem.solvers.stochastic.StochasticPackage#getStandardStochastic()
  * @model
@@ -47,4 +48,31 @@ public interface StandardStochastic extends Stochastic {
 	 * @generated
 	 */
 	void setSeed(long value);
+
+	/**
+	 * Returns the value of the '<em><b>Randomize Seed</b></em>' attribute.
+	 * The default value is <code>"false"</code>.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Randomize Seed</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Randomize Seed</em>' attribute.
+	 * @see #setRandomizeSeed(boolean)
+	 * @see org.eclipse.stem.solvers.stochastic.StochasticPackage#getStandardStochastic_RandomizeSeed()
+	 * @model default="false"
+	 * @generated
+	 */
+	boolean isRandomizeSeed();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.stem.solvers.stochastic.StandardStochastic#isRandomizeSeed <em>Randomize Seed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Randomize Seed</em>' attribute.
+	 * @see #isRandomizeSeed()
+	 * @generated
+	 */
+	void setRandomizeSeed(boolean value);
 } // StandardStochastic
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StochasticPackage.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StochasticPackage.java
index 4a16b5e60..c726aa35f 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StochasticPackage.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/StochasticPackage.java
@@ -184,13 +184,22 @@ public interface StochasticPackage extends EPackage {
 	int STANDARD_STOCHASTIC__SEED = STOCHASTIC_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Randomize Seed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int STANDARD_STOCHASTIC__RANDOMIZE_SEED = STOCHASTIC_FEATURE_COUNT + 1;
+
+	/**
 	 * The number of structural features of the '<em>Standard Stochastic</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int STANDARD_STOCHASTIC_FEATURE_COUNT = STOCHASTIC_FEATURE_COUNT + 1;
+	int STANDARD_STOCHASTIC_FEATURE_COUNT = STOCHASTIC_FEATURE_COUNT + 2;
 
 
 	/**
@@ -225,6 +234,17 @@ public interface StochasticPackage extends EPackage {
 	EAttribute getStandardStochastic_Seed();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.stem.solvers.stochastic.StandardStochastic#isRandomizeSeed <em>Randomize Seed</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Randomize Seed</em>'.
+	 * @see org.eclipse.stem.solvers.stochastic.StandardStochastic#isRandomizeSeed()
+	 * @see #getStandardStochastic()
+	 * @generated
+	 */
+	EAttribute getStandardStochastic_RandomizeSeed();
+
+	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -274,6 +294,14 @@ public interface StochasticPackage extends EPackage {
 		 */
 		EAttribute STANDARD_STOCHASTIC__SEED = eINSTANCE.getStandardStochastic_Seed();
 
+		/**
+		 * The meta object literal for the '<em><b>Randomize Seed</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute STANDARD_STOCHASTIC__RANDOMIZE_SEED = eINSTANCE.getStandardStochastic_RandomizeSeed();
+
 	}
 
 } //StochasticPackage
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StandardStochasticImpl.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StandardStochasticImpl.java
index b79705440..138eab6fe 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StandardStochasticImpl.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StandardStochasticImpl.java
@@ -64,10 +64,11 @@ import org.eclipse.stem.solvers.stochastic.StochasticPackage;
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  *   <li>{@link org.eclipse.stem.solvers.stochastic.impl.StandardStochasticImpl#getSeed <em>Seed</em>}</li>
+ *   <li>{@link org.eclipse.stem.solvers.stochastic.impl.StandardStochasticImpl#isRandomizeSeed <em>Randomize Seed</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -92,6 +93,25 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 	protected long seed = SEED_EDEFAULT;
 
 	/**
+	 * The default value of the '{@link #isRandomizeSeed() <em>Randomize Seed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isRandomizeSeed()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean RANDOMIZE_SEED_EDEFAULT = false;
+	/**
+	 * The cached value of the '{@link #isRandomizeSeed() <em>Randomize Seed</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isRandomizeSeed()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean randomizeSeed = RANDOMIZE_SEED_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated NOT
@@ -521,9 +541,14 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	public long getSeed() {
+		if (this.randomizeSeed) {
+			long millis = System.currentTimeMillis();
+			seed = Math.abs((int) millis);
+			System.out.println("seed = "+seed);
+		}
 		return seed;
 	}
 
@@ -544,11 +569,34 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public boolean isRandomizeSeed() {
+		return randomizeSeed;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setRandomizeSeed(boolean newRandomizeSeed) {
+		boolean oldRandomizeSeed = randomizeSeed;
+		randomizeSeed = newRandomizeSeed;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED, oldRandomizeSeed, randomizeSeed));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 			case StochasticPackage.STANDARD_STOCHASTIC__SEED:
 				return getSeed();
+			case StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED:
+				return isRandomizeSeed();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -564,6 +612,9 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 			case StochasticPackage.STANDARD_STOCHASTIC__SEED:
 				setSeed((Long)newValue);
 				return;
+			case StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED:
+				setRandomizeSeed((Boolean)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -579,6 +630,9 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 			case StochasticPackage.STANDARD_STOCHASTIC__SEED:
 				setSeed(SEED_EDEFAULT);
 				return;
+			case StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED:
+				setRandomizeSeed(RANDOMIZE_SEED_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
@@ -593,6 +647,8 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 		switch (featureID) {
 			case StochasticPackage.STANDARD_STOCHASTIC__SEED:
 				return seed != SEED_EDEFAULT;
+			case StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED:
+				return randomizeSeed != RANDOMIZE_SEED_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -609,6 +665,8 @@ public class StandardStochasticImpl extends StochasticImpl implements StandardSt
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (seed: ");
 		result.append(seed);
+		result.append(", RandomizeSeed: ");
+		result.append(randomizeSeed);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticFactoryImpl.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticFactoryImpl.java
index b33b7dfd1..9efa12a5b 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticFactoryImpl.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticFactoryImpl.java
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.stem.solvers.stochastic.*;
 import org.eclipse.stem.solvers.stochastic.StandardStochastic;
 import org.eclipse.stem.solvers.stochastic.Stochastic;
 import org.eclipse.stem.solvers.stochastic.StochasticFactory;
@@ -27,7 +28,7 @@ public class StochasticFactoryImpl extends EFactoryImpl implements StochasticFac
 	 */
 	public static StochasticFactory init() {
 		try {
-			StochasticFactory theStochasticFactory = (StochasticFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/stem/solvers/stochastic"); 
+			StochasticFactory theStochasticFactory = (StochasticFactory)EPackage.Registry.INSTANCE.getEFactory(StochasticPackage.eNS_URI);
 			if (theStochasticFactory != null) {
 				return theStochasticFactory;
 			}
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticImpl.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticImpl.java
index 72ef48d2b..be1ffb14d 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticImpl.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticImpl.java
@@ -11,8 +11,6 @@ import org.eclipse.stem.solvers.stochastic.StochasticPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Stochastic</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticPackageImpl.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticPackageImpl.java
index 773951aaf..936009bcc 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticPackageImpl.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/impl/StochasticPackageImpl.java
@@ -96,6 +96,7 @@ public class StochasticPackageImpl extends EPackageImpl implements StochasticPac
 		SequencerPackage.eINSTANCE.eClass();
 		SolverPackage.eINSTANCE.eClass();
 		LoggerPackage.eINSTANCE.eClass();
+		EcorePackage.eINSTANCE.eClass();
 
 		// Create package meta-data objects
 		theStochasticPackage.createPackageContents();
@@ -144,6 +145,15 @@ public class StochasticPackageImpl extends EPackageImpl implements StochasticPac
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
+	public EAttribute getStandardStochastic_RandomizeSeed() {
+		return (EAttribute)standardStochasticEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
 	public StochasticFactory getStochasticFactory() {
 		return (StochasticFactory)getEFactoryInstance();
 	}
@@ -171,6 +181,7 @@ public class StochasticPackageImpl extends EPackageImpl implements StochasticPac
 
 		standardStochasticEClass = createEClass(STANDARD_STOCHASTIC);
 		createEAttribute(standardStochasticEClass, STANDARD_STOCHASTIC__SEED);
+		createEAttribute(standardStochasticEClass, STANDARD_STOCHASTIC__RANDOMIZE_SEED);
 	}
 
 	/**
@@ -213,6 +224,7 @@ public class StochasticPackageImpl extends EPackageImpl implements StochasticPac
 
 		initEClass(standardStochasticEClass, StandardStochastic.class, "StandardStochastic", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getStandardStochastic_Seed(), theEcorePackage.getELong(), "seed", "17", 0, 1, StandardStochastic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStandardStochastic_RandomizeSeed(), theEcorePackage.getEBoolean(), "RandomizeSeed", "false", 0, 1, StandardStochastic.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StandardStochasticItemProvider.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StandardStochasticItemProvider.java
index 0f126c233..1c9887de9 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StandardStochasticItemProvider.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StandardStochasticItemProvider.java
@@ -8,6 +8,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
@@ -28,13 +29,7 @@ import org.eclipse.stem.solvers.stochastic.StochasticPackage;
  * @generated
  */
 public class StandardStochasticItemProvider
-	extends StochasticItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends StochasticItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -57,6 +52,7 @@ public class StandardStochasticItemProvider
 			super.getPropertyDescriptors(object);
 
 			addSeedPropertyDescriptor(object);
+			addRandomizeSeedPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -72,8 +68,8 @@ public class StandardStochasticItemProvider
 			(createItemPropertyDescriptor
 				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
 				 getResourceLocator(),
-				 getString("_UI_StandardStochastic_seed_feature"), //$NON-NLS-1$
-				 getString("_UI_PropertyDescriptor_description", "_UI_StandardStochastic_seed_feature", "_UI_StandardStochastic_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				 getString("_UI_StandardStochastic_seed_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_StandardStochastic_seed_feature", "_UI_StandardStochastic_type"),
 				 StochasticPackage.Literals.STANDARD_STOCHASTIC__SEED,
 				 true,
 				 false,
@@ -84,6 +80,28 @@ public class StandardStochasticItemProvider
 	}
 
 	/**
+	 * This adds a property descriptor for the Randomize Seed feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addRandomizeSeedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_StandardStochastic_RandomizeSeed_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_StandardStochastic_RandomizeSeed_feature", "_UI_StandardStochastic_type"),
+				 StochasticPackage.Literals.STANDARD_STOCHASTIC__RANDOMIZE_SEED,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This returns StandardStochastic.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -119,6 +137,7 @@ public class StandardStochasticItemProvider
 
 		switch (notification.getFeatureID(StandardStochastic.class)) {
 			case StochasticPackage.STANDARD_STOCHASTIC__SEED:
+			case StochasticPackage.STANDARD_STOCHASTIC__RANDOMIZE_SEED:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 		}
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StochasticItemProvider.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StochasticItemProvider.java
index bfc9f65e4..36a03bb09 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StochasticItemProvider.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/provider/StochasticItemProvider.java
@@ -9,6 +9,7 @@ import java.util.List;
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
@@ -16,6 +17,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.stem.core.solver.provider.SolverItemProvider;
+import org.eclipse.stem.solvers.stochastic.Stochastic;
 
 /**
  * This is the item provider adapter for a {@link org.eclipse.stem.solvers.stochastic.Stochastic} object.
@@ -24,13 +26,7 @@ import org.eclipse.stem.core.solver.provider.SolverItemProvider;
  * @generated
  */
 public class StochasticItemProvider
-	extends SolverItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
+	extends SolverItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticAdapterFactory.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticAdapterFactory.java
index bed0abd12..cc43e0885 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticAdapterFactory.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticAdapterFactory.java
@@ -9,6 +9,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.solver.Solver;
+import org.eclipse.stem.solvers.stochastic.*;
 import org.eclipse.stem.solvers.stochastic.StandardStochastic;
 import org.eclipse.stem.solvers.stochastic.Stochastic;
 import org.eclipse.stem.solvers.stochastic.StochasticPackage;
diff --git a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticSwitch.java b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticSwitch.java
index a22a91bb3..a924e52b8 100644
--- a/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticSwitch.java
+++ b/core/org.eclipse.stem.solvers.stochastic/src/org/eclipse/stem/solvers/stochastic/util/StochasticSwitch.java
@@ -8,6 +8,7 @@ import org.eclipse.emf.ecore.util.Switch;
 import org.eclipse.stem.core.common.Identifiable;
 import org.eclipse.stem.core.common.SanityChecker;
 import org.eclipse.stem.core.solver.Solver;
+import org.eclipse.stem.solvers.stochastic.*;
 import org.eclipse.stem.solvers.stochastic.StandardStochastic;
 import org.eclipse.stem.solvers.stochastic.Stochastic;
 import org.eclipse.stem.solvers.stochastic.StochasticPackage;
@@ -50,7 +51,7 @@ public class StochasticSwitch<T1> extends Switch<T1> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
+	 * @param ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
 	 */