Browse Source

Fixed new array in the sorting functions.

Chris Cromer 1 year ago
parent
commit
71372cf5dd

+ 23
- 0
.idea/artifacts/EDD.xml View File

@@ -0,0 +1,23 @@
1
+<component name="ArtifactManager">
2
+  <artifact type="javafx" name="EDD">
3
+    <output-path>$PROJECT_DIR$/out/artifacts/EDD</output-path>
4
+    <properties id="javafx-properties">
5
+      <options>
6
+        <option name="appClass" value="cl.cromer.estructuras.Main" />
7
+        <option name="description" value="" />
8
+        <option name="height" value="768" />
9
+        <option name="htmlPlaceholderId" value="" />
10
+        <option name="nativeBundle" value="all" />
11
+        <option name="title" value="Estructuras de Datos" />
12
+        <option name="vendor" value="Chris Cromer" />
13
+        <option name="version" value="" />
14
+        <option name="width" value="1024" />
15
+      </options>
16
+    </properties>
17
+    <root id="root">
18
+      <element id="archive" name="EDD.jar">
19
+        <element id="module-output" name="EDD" />
20
+      </element>
21
+    </root>
22
+  </artifact>
23
+</component>

+ 3
- 0
.idea/dictionaries/cromer.xml View File

@@ -0,0 +1,3 @@
1
+<component name="ProjectDictionaryState">
2
+  <dictionary name="cromer" />
3
+</component>

+ 6
- 0
.idea/encodings.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Encoding">
4
+    <file url="PROJECT" charset="UTF-8" />
5
+  </component>
6
+</project>

+ 29
- 0
.idea/misc.xml View File

@@ -0,0 +1,29 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="MavenImportPreferences">
4
+    <option name="generalSettings">
5
+      <MavenGeneralSettings>
6
+        <option name="mavenHome" value="Bundled (Maven 3)" />
7
+      </MavenGeneralSettings>
8
+    </option>
9
+  </component>
10
+  <component name="ProjectInspectionProfilesVisibleTreeState">
11
+    <entry key="Project Default">
12
+      <profile-state>
13
+        <expanded-state>
14
+          <State>
15
+            <id />
16
+          </State>
17
+        </expanded-state>
18
+        <selected-state>
19
+          <State>
20
+            <id>Internationalization issues</id>
21
+          </State>
22
+        </selected-state>
23
+      </profile-state>
24
+    </entry>
25
+  </component>
26
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
27
+    <output url="file://$PROJECT_DIR$/out" />
28
+  </component>
29
+</project>

+ 8
- 0
.idea/modules.xml View File

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/EDD.iml" filepath="$PROJECT_DIR$/EDD.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="" vcs="Git" />
5
+  </component>
6
+</project>

+ 11
- 0
EDD.iml View File

@@ -0,0 +1,11 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
4
+    <exclude-output />
5
+    <content url="file://$MODULE_DIR$">
6
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
7
+    </content>
8
+    <orderEntry type="inheritedJdk" />
9
+    <orderEntry type="sourceFolder" forTests="false" />
10
+  </component>
11
+</module>

+ 5
- 0
edd.properties View File

@@ -0,0 +1,5 @@
1
+path.variable.kotlin_bundled=/usr/share/intellij-idea-ultimate-edition/plugins/Kotlin/kotlinc
2
+path.variable.maven_repository=/home/cromer/.m2/repository
3
+jdk.home.1.8=/usr/lib/jvm/java-8-jdk
4
+idea.home=/usr/share/intellij-idea-ultimate-edition
5
+javac2.instrumentation.includeJavaRuntime=false

+ 192
- 0
edd.xml View File

@@ -0,0 +1,192 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project name="edd" default="all">
3
+  
4
+  
5
+  <property file="edd.properties"/>
6
+  <!-- Uncomment the following property if no tests compilation is needed -->
7
+  <!-- 
8
+  <property name="skip.tests" value="true"/>
9
+   -->
10
+  
11
+  <!-- Compiler options -->
12
+  
13
+  <property name="compiler.debug" value="on"/>
14
+  <property name="compiler.generate.no.warnings" value="off"/>
15
+  <property name="compiler.args" value=""/>
16
+  <property name="compiler.max.memory" value="700m"/>
17
+  <patternset id="ignored.files">
18
+    <exclude name="**/*.hprof/**"/>
19
+    <exclude name="**/*.pyc/**"/>
20
+    <exclude name="**/*.pyo/**"/>
21
+    <exclude name="**/*.rbc/**"/>
22
+    <exclude name="**/*.yarb/**"/>
23
+    <exclude name="**/*~/**"/>
24
+    <exclude name="**/.DS_Store/**"/>
25
+    <exclude name="**/.git/**"/>
26
+    <exclude name="**/.hg/**"/>
27
+    <exclude name="**/.svn/**"/>
28
+    <exclude name="**/CVS/**"/>
29
+    <exclude name="**/__pycache__/**"/>
30
+    <exclude name="**/_svn/**"/>
31
+    <exclude name="**/vssver.scc/**"/>
32
+    <exclude name="**/vssver2.scc/**"/>
33
+  </patternset>
34
+  <patternset id="library.patterns">
35
+    <include name="*.war"/>
36
+    <include name="*.swc"/>
37
+    <include name="*.apk"/>
38
+    <include name="*.zip"/>
39
+    <include name="*.egg"/>
40
+    <include name="*.ane"/>
41
+    <include name="*.jar"/>
42
+    <include name="*.ear"/>
43
+  </patternset>
44
+  <patternset id="compiler.resources">
45
+    <exclude name="**/?*.java"/>
46
+    <exclude name="**/?*.form"/>
47
+    <exclude name="**/?*.class"/>
48
+    <exclude name="**/?*.groovy"/>
49
+    <exclude name="**/?*.scala"/>
50
+    <exclude name="**/?*.flex"/>
51
+    <exclude name="**/?*.kt"/>
52
+    <exclude name="**/?*.clj"/>
53
+    <exclude name="**/?*.aj"/>
54
+  </patternset>
55
+  
56
+  <!-- JDK definitions -->
57
+  
58
+  <property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
59
+  <path id="jdk.classpath.1.8">
60
+    <fileset dir="${jdk.home.1.8}">
61
+      <include name="jre/lib/charsets.jar"/>
62
+      <include name="jre/lib/deploy.jar"/>
63
+      <include name="jre/lib/ext/cldrdata.jar"/>
64
+      <include name="jre/lib/ext/dnsns.jar"/>
65
+      <include name="jre/lib/ext/jaccess.jar"/>
66
+      <include name="jre/lib/ext/jfxrt.jar"/>
67
+      <include name="jre/lib/ext/localedata.jar"/>
68
+      <include name="jre/lib/ext/nashorn.jar"/>
69
+      <include name="jre/lib/ext/sunec.jar"/>
70
+      <include name="jre/lib/ext/sunjce_provider.jar"/>
71
+      <include name="jre/lib/ext/sunpkcs11.jar"/>
72
+      <include name="jre/lib/ext/zipfs.jar"/>
73
+      <include name="jre/lib/javaws.jar"/>
74
+      <include name="jre/lib/jce.jar"/>
75
+      <include name="jre/lib/jfr.jar"/>
76
+      <include name="jre/lib/jfxswt.jar"/>
77
+      <include name="jre/lib/jsse.jar"/>
78
+      <include name="jre/lib/management-agent.jar"/>
79
+      <include name="jre/lib/plugin.jar"/>
80
+      <include name="jre/lib/resources.jar"/>
81
+      <include name="jre/lib/rt.jar"/>
82
+    </fileset>
83
+  </path>
84
+  
85
+  <property name="project.jdk.home" value="${jdk.home.1.8}"/>
86
+  <property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
87
+  <property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
88
+  <!-- Register Custom Compiler Taskdefs -->
89
+  <property name="javac2.home" value="${idea.home}/lib"/>
90
+  <path id="javac2.classpath">
91
+    <pathelement location="${javac2.home}/javac2.jar"/>
92
+    <pathelement location="${javac2.home}/jdom.jar"/>
93
+    <pathelement location="${javac2.home}/asm-all.jar"/>
94
+    <pathelement location="${javac2.home}/jgoodies-forms.jar"/>
95
+  </path>
96
+  <target name="register.custom.compilers">
97
+    <taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
98
+    <taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
99
+  </target>
100
+  
101
+  <!-- Modules -->
102
+  
103
+  
104
+  <!-- Module EDD -->
105
+  
106
+  <dirname property="module.edd.basedir" file="${ant.file}"/>
107
+  
108
+  
109
+  <property name="module.jdk.home.edd" value="${project.jdk.home}"/>
110
+  <property name="module.jdk.bin.edd" value="${project.jdk.bin}"/>
111
+  <property name="module.jdk.classpath.edd" value="${project.jdk.classpath}"/>
112
+  
113
+  <property name="compiler.args.edd" value="-encoding UTF-8 -source 8 -target 8 ${compiler.args}"/>
114
+  
115
+  <property name="edd.output.dir" value="${module.edd.basedir}/out/production/EDD"/>
116
+  <property name="edd.testoutput.dir" value="${module.edd.basedir}/out/test/EDD"/>
117
+  
118
+  <path id="edd.module.bootclasspath">
119
+    <!-- Paths to be included in compilation bootclasspath -->
120
+  </path>
121
+  
122
+  <path id="edd.module.production.classpath">
123
+    <path refid="${module.jdk.classpath.edd}"/>
124
+  </path>
125
+  
126
+  <path id="edd.runtime.production.module.classpath">
127
+    <pathelement location="${edd.output.dir}"/>
128
+  </path>
129
+  
130
+  <path id="edd.module.classpath">
131
+    <path refid="${module.jdk.classpath.edd}"/>
132
+    <pathelement location="${edd.output.dir}"/>
133
+  </path>
134
+  
135
+  <path id="edd.runtime.module.classpath">
136
+    <pathelement location="${edd.testoutput.dir}"/>
137
+    <pathelement location="${edd.output.dir}"/>
138
+  </path>
139
+  
140
+  
141
+  <patternset id="excluded.from.module.edd">
142
+    <patternset refid="ignored.files"/>
143
+  </patternset>
144
+  
145
+  <patternset id="excluded.from.compilation.edd">
146
+    <patternset refid="excluded.from.module.edd"/>
147
+  </patternset>
148
+  
149
+  <path id="edd.module.sourcepath">
150
+    <dirset dir="${module.edd.basedir}">
151
+      <include name="src"/>
152
+    </dirset>
153
+  </path>
154
+  
155
+  
156
+  <target name="compile.module.edd" depends="compile.module.edd.production,compile.module.edd.tests" description="Compile module EDD"/>
157
+  
158
+  <target name="compile.module.edd.production" depends="register.custom.compilers" description="Compile module EDD; production classes">
159
+    <mkdir dir="${edd.output.dir}"/>
160
+    <javac2 destdir="${edd.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.edd}/javac">
161
+      <compilerarg line="${compiler.args.edd}"/>
162
+      <bootclasspath refid="edd.module.bootclasspath"/>
163
+      <classpath refid="edd.module.production.classpath"/>
164
+      <src refid="edd.module.sourcepath"/>
165
+      <patternset refid="excluded.from.compilation.edd"/>
166
+    </javac2>
167
+    
168
+    <copy todir="${edd.output.dir}">
169
+      <fileset dir="${module.edd.basedir}/src">
170
+        <patternset refid="compiler.resources"/>
171
+        <type type="file"/>
172
+      </fileset>
173
+    </copy>
174
+  </target>
175
+  
176
+  <target name="compile.module.edd.tests" depends="register.custom.compilers,compile.module.edd.production" description="compile module EDD; test classes" unless="skip.tests"/>
177
+  
178
+  <target name="clean.module.edd" description="cleanup module">
179
+    <delete dir="${edd.output.dir}"/>
180
+    <delete dir="${edd.testoutput.dir}"/>
181
+  </target>
182
+  
183
+  <target name="init" description="Build initialization">
184
+    <!-- Perform any build initialization in this target -->
185
+  </target>
186
+  
187
+  <target name="clean" depends="clean.module.edd" description="cleanup all"/>
188
+  
189
+  <target name="build.modules" depends="init, clean, compile.module.edd" description="build all modules"/>
190
+  
191
+  <target name="all" depends="build.modules" description="build all"/>
192
+</project>

+ 3
- 3
index.html View File

@@ -18,10 +18,10 @@
18 18
 		</script>
19 19
 	</head>
20 20
 	<body>
21
-		<b>Estructuras de Datos 1.0.3 (21/08/2016)</b><br>
21
+		<b>Estructuras de Datos 1.0.4 (17/04/2017)</b><br>
22 22
 		<b>The webstart and embedded verions require java 8 to run! It is also necessary to add cromer.cl to your trusted sites in java settings because the java applet is unsigned.</b><br><hr>
23
-		<b>Windows:</b> <a href='EDD-1.0.3.zip'>click to download windows binary</a><br><hr>
24
-		<b>Linux:</b> <a href='EDD-1.0.3.tar.gz'>click to download linux binary</a><br><hr>
23
+		<b>Windows:</b> <a href='EDD-1.0.4.zip'>click to download windows binary</a><br><hr>
24
+		<b>Linux:</b> <a href='EDD-1.0.4.tar.gz'>click to download linux binary</a><br><hr>
25 25
 		<b>Webstart:</b> <a href='Estructuras_de_Datos.jnlp' onclick="return launchApplication('Estructuras_de_Datos.jnlp');">click to launch this app as webstart</a><br><hr>
26 26
 		<b>Embedded:</b> <a href='edd.html'>click to launch this app as embedded app</a><br><hr><br>
27 27
 		<b>Source code:</b> <a href='https://github.com/cromerc/Estructuras_de_Datos'>github</a><br><hr>

+ 1
- 0
src/cl/cromer/estructuras/Array.java View File

@@ -131,6 +131,7 @@ final public class Array {
131 131
 		for (int i = 0; i < size(); i++) {
132 132
 			array[i] = null;
133 133
 		}
134
+		size = 0;
134 135
 	}
135 136
 
136 137
 	/**

+ 2
- 2
src/cl/cromer/estructuras/Main.java View File

@@ -24,10 +24,10 @@ import java.util.prefs.Preferences;
24 24
  * Se necesita java 8 con javafx instalado.
25 25
  *
26 26
  * @author Chris Cromer
27
- * @version 1.0.3
27
+ * @version 1.0.4
28 28
  */
29 29
 public class Main extends Application {
30
-	static public String VERSION = "1.0.3";
30
+	static public String VERSION = "1.0.4";
31 31
 
32 32
 	/**
33 33
 	 * El stage pricipal

Loading…
Cancel
Save