Merge branch 'dev'

.gitignore

@@ -4,3 +4,6 @@ nbproject/private/private.xml
 nbproject/private/private.properties
 /log/
 *0.txt
+nbproject/genfiles.properties
+
+nbproject/build-impl.xml

bash.exe.stackdump

@@ -0,0 +1,11 @@
+Stack trace:
+Frame        Function    Args
+00800000010  0018006392E (00180279F10, 0018026AFD1, 00800000010, 000FFFFBA20)
+00800000010  0018004973A (00100002000, 000FFFFCBC0, 00180350128, 00000000002)
+00800000010  00180049772 (00000000002, 00180350438, 00800000010, 00000000008)
+00800000010  0018005CBDD (0018004ABEC, 000FFFFCC55, 00000000000, 000FFFFCC50)
+000FFFFCBCC  0018005CD4F (205C795C745C745C, 655C205C265C265C, 205C6F5C685C635C, 695C6C5C245C225C)
+000FFFFCCE0  00180049EE8 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  00180048846 (00000000000, 00000000000, 00000000000, 00000000000)
+000FFFFFFF0  001800488F4 (00000000000, 00000000000, 00000000000, 00000000000)
+End of stack trace

config.txt

@@ -1,5 +1,8 @@
 Archivos=GKD-c_1_n500_m50.txt GKD-c_2_n500_m50.txt GKD-c_3_n500_m50.txt SOM-b_11_n300_m90.txt SOM-b_12_n300_m120.txt SOM-b_13_n400_m40.txt MDG-a_21_n2000_m200.txt MDG-a_22_n2000_m200.txt MDG-a_23_n2000_m200.txt
 Semillas=26522589 65225892 52258926 22589265 25892652
-Algoritmos=Greedy Búsqueda_Local Búsqueda_Tabú
+Poblacion=50
 Evaluaciones=50000
-Tenencia_Tabu=5
+Prob_Cruce=0.7
+Prob_Mutacion=0.05
+Elite=2 3
+Cruce=2P MPX

nbproject/project.properties

@@ -1,9 +1,10 @@
 annotation.processing.enabled=true
 annotation.processing.enabled.in.editor=false
-annotation.processing.processor.options=
 annotation.processing.processors.list=
 annotation.processing.run.all.processors=true
 annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
+application.title=Metaheristicas_Pr_2
+application.vendor=Miguerubsk
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -32,9 +33,10 @@ dist.jar=${dist.dir}/Metaheristicas_Pr_2.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.jlink.dir=${dist.dir}/jlink
 dist.jlink.output=${dist.jlink.dir}/Metaheristicas_Pr_2
+endorsed.classpath=
 excludes=
 includes=**
-jar.compress=false
+jar.compress=true
 javac.classpath=
 # Space-separated list of extra javac options
 javac.compilerargs=