commit cadem
Merge branch 'JCell_Cadem'

Conflicts:
	build/built-jar.properties
	build/classes/JCellIslands/JCellIslands.class
	build/classes/MO/Archive.class
	build/classes/cfg/genGAforCSP.cfg
	build/classes/com/go/trove/classfile/AttributeFactory.class
	build/classes/com/go/trove/classfile/ClassFile.class
	build/classes/com/go/trove/classfile/ClassFileDataLoader.class
	build/classes/com/go/trove/classfile/CodeAssembler.class
	build/classes/com/go/trove/classfile/CodeAssemblerPrinter.class
	build/classes/com/go/trove/classfile/ConstantClassInfo.class
	build/classes/com/go/trove/classfile/ConstantNameAndTypeInfo.class
	build/classes/com/go/trove/classfile/ConstantPool.class
	build/classes/com/go/trove/classfile/FieldInfo.class
	build/classes/com/go/trove/classfile/LocalVariable.class
	build/classes/com/go/trove/classfile/LocalVariableTableAttr.class
	build/classes/com/go/trove/classfile/MethodInfo.class
	build/classes/com/go/trove/classfile/TypeDescriptor.class
	build/classes/com/go/trove/io/ByteBuffer.class
	build/classes/com/go/trove/io/ByteData.class
	build/classes/com/go/trove/io/CharToByteBuffer.class
	build/classes/com/go/trove/log/IntervalLogStream$Factory.class
	build/classes/com/go/trove/log/IntervalLogStream.class
	build/classes/com/go/trove/log/LogEvent.class
	build/classes/com/go/trove/log/LogListener.class
	build/classes/com/go/trove/log/LogScribe.class
	build/classes/com/go/trove/net/CheckedSocket$ExceptionListener.class
	build/classes/com/go/trove/net/FilteredSocket$Impl.class
	build/classes/com/go/trove/net/InetAddressListener.class
	build/classes/com/go/trove/net/LazySocket$Impl$Out.class
	build/classes/com/go/trove/net/LazySocket$Impl.class
	build/classes/com/go/trove/net/LazySocket.class
	build/classes/com/go/trove/net/SocketFactory.class
	build/classes/com/go/trove/util/BeanComparator.class
	build/classes/com/go/trove/util/Deflater.class
	build/classes/com/go/trove/util/Depot$Factory.class
	build/classes/com/go/trove/util/Depot$Filter.class
	build/classes/com/go/trove/util/FastDateFormat$NumberRule.class
	build/classes/com/go/trove/util/FastDateFormat$Rule.class
	build/classes/com/go/trove/util/FastDateFormat.class
	build/classes/com/go/trove/util/MergedClass$InstanceFactory.class
	build/classes/com/go/trove/util/MergedClass.class
	build/classes/com/go/trove/util/NullKeyMap$3.class
	build/classes/com/go/trove/util/PropertyMap$EntrySet.class
	build/classes/com/go/trove/util/PropertyMap.class
	build/classes/com/go/trove/util/PropertyParser$ErrorListener.class
	build/classes/com/go/trove/util/ThreadPool.class
	build/classes/com/go/trove/util/ThreadPoolListener.class
	build/classes/com/go/trove/util/Utils$EmptyMap.class
	build/classes/com/go/trove/util/Utils$NullEqualOrder.class
	build/classes/com/go/trove/util/Utils$NullHighOrder.class
	build/classes/com/go/trove/util/Utils$NullLowOrder.class
	build/classes/com/go/trove/util/Utils$VoidMap.class
	build/classes/com/go/trove/util/Utils.class
	build/classes/com/go/trove/util/plugin/Plugin.class
	build/classes/com/go/trove/util/plugin/PluginListener.class
	build/classes/com/go/trove/util/tq/TransactionQueueListener.class
	build/classes/com/go/trove/util/tq/UncaughtExceptionListener.class
	build/classes/jcell/GenerationListener.class
	build/classes/jcell/Individual.class
	build/classes/jcell/Operator.class
	build/classes/jcell/Problem.class
	build/classes/jcell/ReadConf$1.class
	build/classes/jcell/Statistic.class
	build/classes/jcell/Utilities.class
	build/classes/problems/Combinatorial/COUNTSAT.class
	build/classes/problems/Combinatorial/CSP.class
	build/classes/problems/Combinatorial/DNAFragmentAssembling.class
	build/classes/problems/Combinatorial/ECC.class
	build/classes/problems/Combinatorial/FMS.class
	build/classes/problems/Combinatorial/MAXCUT100.class
	build/classes/problems/Combinatorial/MAXCUT20_01.class
	build/classes/problems/Combinatorial/MAXCUT20_09.class
	build/classes/problems/Combinatorial/MMDP.class
	build/classes/problems/Combinatorial/MTTP.class
	build/classes/problems/Combinatorial/MTTP100.class
	build/classes/problems/Combinatorial/MTTP200.class
	build/classes/problems/Combinatorial/OneMax.class
	build/classes/problems/Combinatorial/PEAK.class
	build/classes/problems/Combinatorial/Resources/ComparaPiezaId.class
	build/classes/problems/Combinatorial/SAT.class
	build/classes/problems/Continuous/Ackley.class
	build/classes/problems/Continuous/Chebyschev.class
	build/classes/problems/Continuous/EF10.class
	build/classes/problems/Continuous/FMS.class
	build/classes/problems/Continuous/Griewangk.class
	build/classes/problems/Continuous/Griewangk_Classic.class
	build/classes/problems/Continuous/Rastrigin.class
	build/classes/problems/Continuous/Rastrigin_Classic.class
	build/classes/problems/Continuous/Rosenbrock.class
	build/classes/problems/Continuous/Schwefel.class
	build/classes/problems/Continuous/Sle.class
	build/classes/problems/Continuous/Sphere.class
	build/classes/problems/MO/Constr_Ex.class
	build/classes/problems/MO/Deb.class
	build/classes/problems/MO/Fonseca.class
	build/classes/problems/MO/Golinski.class
	build/classes/problems/MO/KUR.class
	build/classes/problems/MO/Schaffer.class
	build/classes/problems/Sum.class
	build/classes/problems/TakeoverProblem.class
	dist/CSP-test.txt
	dist/CSP-training.txt
	dist/JCell.jar
	dist/csp_wrapper.rb
	dist/salida/focused-runs2000-runobjqual-overallobjmean-maxit200000000-time60.0-tunerTime3600.0-algorubycsp_wrapper.rb-log_0.txt
	dist/salida/focused-runs2000-runobjqual-overallobjmean-maxit200000000-time60.0-tunerTime3600.0-algorubycsp_wrapper.rb-traj_0.txt
	dist/salida/instance_seed_file_saved-CSP-training.txt-numRun_0.txt
	dist/salida/test_instance_seed_file_saved-CSP-test.txt-numRun_0.txt
	nbproject/private/private.properties
	nbproject/project.properties
	src/JCellIslands/JCellIslands.java
	src/cfg/genGAforCSP.cfg
	temp/CSP-test.txt
	temp/CSP-training.txt
Merge branch 'SKP' of https://github.com/diego1982chile/cGA_CSP.git into SKP
T-Shape Cutting pattern