UBB
/
Estructuras_de_Datos
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity
Browse Source

Fixed new array in the sorting functions.

master
Chris Cromer 4 years ago
committed by Chris Cromer
parent
b5157143bf
commit
71372cf5dd
12 changed files with 289 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      .idea/artifacts/EDD.xml
  2. 3
      .idea/dictionaries/cromer.xml
  3. 6
      .idea/encodings.xml
  4. 29
      .idea/misc.xml
  5. 8
      .idea/modules.xml
  6. 6
      .idea/vcs.xml
  7. 11
      EDD.iml
  8. 5
      edd.properties
  9. 192
      edd.xml
  10. 6
      index.html
  11. 1
      src/cl/cromer/estructuras/Array.java
  12. 4
      src/cl/cromer/estructuras/Main.java

23
.idea/artifacts/EDD.xml
View File

@ -0,0 +1,23 @@
<component name="ArtifactManager">
<artifact type="javafx" name="EDD">
<output-path>$PROJECT_DIR$/out/artifacts/EDD</output-path>
<properties id="javafx-properties">
<options>
<option name="appClass" value="cl.cromer.estructuras.Main" />
<option name="description" value="" />
<option name="height" value="768" />
<option name="htmlPlaceholderId" value="" />
<option name="nativeBundle" value="all" />
<option name="title" value="Estructuras de Datos" />
<option name="vendor" value="Chris Cromer" />
<option name="version" value="" />
<option name="width" value="1024" />
</options>
</properties>
<root id="root">
<element id="archive" name="EDD.jar">
<element id="module-output" name="EDD" />
</element>
</root>
</artifact>
</component>

3
.idea/dictionaries/cromer.xml
View File

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

6
.idea/encodings.xml
View File

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

29
.idea/misc.xml
View File

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="MavenImportPreferences">
<option name="generalSettings">
<MavenGeneralSettings>
<option name="mavenHome" value="Bundled (Maven 3)" />
</MavenGeneralSettings>
</option>
</component>
<component name="ProjectInspectionProfilesVisibleTreeState">
<entry key="Project Default">
<profile-state>
<expanded-state>
<State>
<id />
</State>
</expanded-state>
<selected-state>
<State>
<id>Internationalization issues</id>
</State>
</selected-state>
</profile-state>
</entry>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml
View File

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

6
.idea/vcs.xml
View File

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

11
EDD.iml
View File

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

5
edd.properties
View File

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

192
edd.xml
View File

@ -0,0 +1,192 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="edd" default="all">
<property file="edd.properties"/>
<!-- Uncomment the following property if no tests compilation is needed -->
<!--
<property name="skip.tests" value="true"/>
-->
<!-- Compiler options -->
<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="700m"/>
<patternset id="ignored.files">
<exclude name="**/*.hprof/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/*.rbc/**"/>
<exclude name="**/*.yarb/**"/>
<exclude name="**/*~/**"/>
<exclude name="**/.DS_Store/**"/>
<exclude name="**/.git/**"/>
<exclude name="**/.hg/**"/>
<exclude name="**/.svn/**"/>
<exclude name="**/CVS/**"/>
<exclude name="**/__pycache__/**"/>
<exclude name="**/_svn/**"/>
<exclude name="**/vssver.scc/**"/>
<exclude name="**/vssver2.scc/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.war"/>
<include name="*.swc"/>
<include name="*.apk"/>
<include name="*.zip"/>
<include name="*.egg"/>
<include name="*.ane"/>
<include name="*.jar"/>
<include name="*.ear"/>
</patternset>
<patternset id="compiler.resources">
<exclude name="**/?*.java"/>
<exclude name="**/?*.form"/>
<exclude name="**/?*.class"/>
<exclude name="**/?*.groovy"/>
<exclude name="**/?*.scala"/>
<exclude name="**/?*.flex"/>
<exclude name="**/?*.kt"/>
<exclude name="**/?*.clj"/>
<exclude name="**/?*.aj"/>
</patternset>
<!-- JDK definitions -->
<property name="jdk.bin.1.8" value="${jdk.home.1.8}/bin"/>
<path id="jdk.classpath.1.8">
<fileset dir="${jdk.home.1.8}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/deploy.jar"/>
<include name="jre/lib/ext/cldrdata.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
<include name="jre/lib/ext/jaccess.jar"/>
<include name="jre/lib/ext/jfxrt.jar"/>
<include name="jre/lib/ext/localedata.jar"/>
<include name="jre/lib/ext/nashorn.jar"/>
<include name="jre/lib/ext/sunec.jar"/>
<include name="jre/lib/ext/sunjce_provider.jar"/>
<include name="jre/lib/ext/sunpkcs11.jar"/>
<include name="jre/lib/ext/zipfs.jar"/>
<include name="jre/lib/javaws.jar"/>
<include name="jre/lib/jce.jar"/>
<include name="jre/lib/jfr.jar"/>
<include name="jre/lib/jfxswt.jar"/>
<include name="jre/lib/jsse.jar"/>
<include name="jre/lib/management-agent.jar"/>
<include name="jre/lib/plugin.jar"/>
<include name="jre/lib/resources.jar"/>
<include name="jre/lib/rt.jar"/>
</fileset>
</path>
<property name="project.jdk.home" value="${jdk.home.1.8}"/>
<property name="project.jdk.bin" value="${jdk.bin.1.8}"/>
<property name="project.jdk.classpath" value="jdk.classpath.1.8"/>
<!-- Register Custom Compiler Taskdefs -->
<property name="javac2.home" value="${idea.home}/lib"/>
<path id="javac2.classpath">
<pathelement location="${javac2.home}/javac2.jar"/>
<pathelement location="${javac2.home}/jdom.jar"/>
<pathelement location="${javac2.home}/asm-all.jar"/>
<pathelement location="${javac2.home}/jgoodies-forms.jar"/>
</path>
<target name="register.custom.compilers">
<taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
<taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
</target>
<!-- Modules -->
<!-- Module EDD -->
<dirname property="module.edd.basedir" file="${ant.file}"/>
<property name="module.jdk.home.edd" value="${project.jdk.home}"/>
<property name="module.jdk.bin.edd" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.edd" value="${project.jdk.classpath}"/>
<property name="compiler.args.edd" value="-encoding UTF-8 -source 8 -target 8 ${compiler.args}"/>
<property name="edd.output.dir" value="${module.edd.basedir}/out/production/EDD"/>
<property name="edd.testoutput.dir" value="${module.edd.basedir}/out/test/EDD"/>
<path id="edd.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>
<path id="edd.module.production.classpath">
<path refid="${module.jdk.classpath.edd}"/>
</path>
<path id="edd.runtime.production.module.classpath">
<pathelement location="${edd.output.dir}"/>
</path>
<path id="edd.module.classpath">
<path refid="${module.jdk.classpath.edd}"/>
<pathelement location="${edd.output.dir}"/>
</path>
<path id="edd.runtime.module.classpath">
<pathelement location="${edd.testoutput.dir}"/>
<pathelement location="${edd.output.dir}"/>
</path>
<patternset id="excluded.from.module.edd">
<patternset refid="ignored.files"/>
</patternset>
<patternset id="excluded.from.compilation.edd">
<patternset refid="excluded.from.module.edd"/>
</patternset>
<path id="edd.module.sourcepath">
<dirset dir="${module.edd.basedir}">
<include name="src"/>
</dirset>
</path>
<target name="compile.module.edd" depends="compile.module.edd.production,compile.module.edd.tests" description="Compile module EDD"/>
<target name="compile.module.edd.production" depends="register.custom.compilers" description="Compile module EDD; production classes">
<mkdir dir="${edd.output.dir}"/>
<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">
<compilerarg line="${compiler.args.edd}"/>
<bootclasspath refid="edd.module.bootclasspath"/>
<classpath refid="edd.module.production.classpath"/>
<src refid="edd.module.sourcepath"/>
<patternset refid="excluded.from.compilation.edd"/>
</javac2>
<copy todir="${edd.output.dir}">
<fileset dir="${module.edd.basedir}/src">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>
<target name="compile.module.edd.tests" depends="register.custom.compilers,compile.module.edd.production" description="compile module EDD; test classes" unless="skip.tests"/>
<target name="clean.module.edd" description="cleanup module">
<delete dir="${edd.output.dir}"/>
<delete dir="${edd.testoutput.dir}"/>
</target>
<target name="init" description="Build initialization">
<!-- Perform any build initialization in this target -->
</target>
<target name="clean" depends="clean.module.edd" description="cleanup all"/>
<target name="build.modules" depends="init, clean, compile.module.edd" description="build all modules"/>
<target name="all" depends="build.modules" description="build all"/>
</project>

6
index.html
View File

@ -18,10 +18,10 @@
</script>
</head>
<body>
<b>Estructuras de Datos 1.0.3 (21/08/2016)</b><br>
<b>Estructuras de Datos 1.0.4 (17/04/2017)</b><br>
<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>
<b>Windows:</b> <a href='EDD-1.0.3.zip'>click to download windows binary</a><br><hr>
<b>Linux:</b> <a href='EDD-1.0.3.tar.gz'>click to download linux binary</a><br><hr>
<b>Windows:</b> <a href='EDD-1.0.4.zip'>click to download windows binary</a><br><hr>
<b>Linux:</b> <a href='EDD-1.0.4.tar.gz'>click to download linux binary</a><br><hr>
<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>
<b>Embedded:</b> <a href='edd.html'>click to launch this app as embedded app</a><br><hr><br>
<b>Source code:</b> <a href='https://github.com/cromerc/Estructuras_de_Datos'>github</a><br><hr>

1
src/cl/cromer/estructuras/Array.java
View File

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

4
src/cl/cromer/estructuras/Main.java
View File

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

Write Preview
Loading…
Cancel
Save