bug fixes :D

build.xml

@@ -31,7 +31,16 @@
 		</javac>
 	</target>
     
-    <target name="jar" depends="compile" description="Jarring all T3 classes.">
+    <!-- for jarring T3 without dependencies -->        
+    <target name="jarT3only" depends="compile" description="Jarring all T3 classes.">
+        <echo>Copying licenses... </echo>
+		<copy file="license.txt" todir="${build}/T3/classes"/>
+		<copy file="gpl_license.txt" todir="${build}/T3/classes"/>
+		<echo>Jarring all T3 classes... </echo>
+		<jar basedir="${build}/classes" destfile="${build}/${RELEASEname}_withoutdependencies.jar" /> 
+	</target>
+    
+    <target name="jar" depends="compile" description="Jarring all T3 classes plus all dependencies.">
         <echo>Copying licenses... </echo>
 		<copy file="license.txt" todir="${build}/T3/classes"/>
 		<copy file="gpl_license.txt" todir="${build}/T3/classes"/>
@@ -58,11 +67,12 @@
 	<property name="VERSION" value="${RELEASEname}"/>
 
 	<!-- for packing a distribution zip -->
-	<target name="dist" depends="jar,javadocs">
+	<target name="dist" depends="jarT3only,jar,javadocs">
 		<delete dir="${dist}"/>
 		<mkdir dir="${dist}" />
 		<copy file="license.txt" todir="${dist}"/>
 		<copy file="gpl_license.txt" todir="${dist}"/>
+        <copy file="${build}/${RELEASEname}_withoutdependencies.jar" todir="${dist}"/>
 		<copy file="${build}/${RELEASEname}.jar" todir="${dist}"/>
         <mkdir dir="${dist}/docs" />
         <copy todir="${dist}/docs">
@@ -72,14 +82,7 @@
 		<zip basedir="${dist}" destfile="${build}/${VERSION}_dist.zip" />
 	</target>
 			
-    <!-- for jarring T3 and support tools for SBST unit testing tool competition -->        
-    <target name="jarT3SBST" depends="jar" description="Jarring all T3 classes.">
-		<jar destfile="${build}/T3G2_SBST2016.jar" > 
-		     <zipfileset src="${build}/${RELEASEname}.jar"   includes="**/*.class"/>
-		     <zipfileset src="${build}/../t3static/T3static_v0.jar"   includes="**/*.class"/>
-		     <zipfileset src="${build}/../t3tools/CPscanner.jar"   includes="**/*.class"/>
-		</jar>
-	</target>        
+      
             
 	<target name="clean" description="Cleaning.">
 		<echo>Cleaning... </echo>

src/Sequenic/T3/DerivativeSuiteGens/Gen2/EvoSingleTarget.java

@@ -61,7 +61,7 @@ public class EvoSingleTarget extends SingleTarget{
 			// if the mode is switch back to random, throw away the evolved population
 			if (isInRandomMode()) evolvedPopulation = null ;
 		}
-		if (isInRandomMode()) return super.generateFreshSuite() ;
+		if (suite==null || isInRandomMode()) return super.generateFreshSuite() ;
 		
 		//System.out.println(">>>>>>>>") ;
 		// evo-mode

src/Sequenic/T3/ImplementationMap.java

@@ -289,8 +289,15 @@ public class ImplementationMap {
     	return k ;
     }
     
+    /**
+     * Get an implementation class of C. If C is already instantiable, return C itself. Else
+     * we look in the impsMap. If no implementation map can be found, return null.
+     */
     public Class getRndImp(Class C) {
     	if (!knownClasses.containsKey(C)) registerClass(C) ;
+    	Instantiation I = knownClasses.get(C) ;
+    	if (I.hasKnownInstantiationMethod()) return C ;
+    	if (!impsMap.containsKey(C)) return null ;
     	return impsMap.get(C).getRnd() ;
     }