structix/Textanalyse
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#2 hinzugefügt, CLI & Menu angepasst

Browse Source
This commit is contained in:
structix
2016-05-26 12:02:03 +02:00
parent d461961c95
commit 9f534cc120
9 changed files with 140 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
.idea/workspace.xml generated
View File

@@ -7,10 +7,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e8709267-1337-4638-85fd-ec9407fa5fdd" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/artifacts/Textanalyse_jar.xml" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Textanalyse/com/structix/CommandLineInterface.class" afterPath="$PROJECT_DIR$/out/production/Textanalyse/com/structix/CommandLineInterface.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/Textanalyse/com/structix/Main.class" afterPath="$PROJECT_DIR$/out/production/Textanalyse/com/structix/Main.class" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/structix/Analyse.java" afterPath="$PROJECT_DIR$/src/com/structix/Analyse.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/com/structix/CommandLineInterface.java" afterPath="$PROJECT_DIR$/src/com/structix/CommandLineInterface.java" />
@@ -41,8 +37,8 @@
<file leaf-file-name="Main.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/com/structix/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
<state relative-caret-position="556">
<caret line="31" column="30" selection-start-line="31" selection-start-column="30" selection-end-line="31" selection-end-column="30" />
<folding />
</state>
</provider>
@@ -51,8 +47,8 @@
<file leaf-file-name="CommandLineInterface.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/structix/CommandLineInterface.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="809">
<caret line="109" column="34" selection-start-line="109" selection-start-column="34" selection-end-line="109" selection-end-column="34" />
<state relative-caret-position="1062">
<caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
<folding />
</state>
</provider>
@@ -71,8 +67,8 @@
<file leaf-file-name="Analyse.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/structix/Analyse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="235" column="50" selection-start-line="235" selection-start-column="50" selection-end-line="235" selection-end-column="50" />
<state relative-caret-position="1006">
<caret line="282" column="115" selection-start-line="282" selection-start-column="115" selection-end-line="282" selection-end-column="115" />
<folding />
</state>
</provider>
@@ -83,7 +79,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -101,8 +102,8 @@
<file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/com/structix/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="503">
<caret line="113" column="20" selection-start-line="113" selection-start-column="20" selection-end-line="113" selection-end-column="20" />
<state relative-caret-position="448">
<caret line="93" column="22" selection-start-line="93" selection-start-column="22" selection-end-line="93" selection-end-column="22" />
<folding />
</state>
</provider>
@@ -172,9 +173,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -227,6 +225,9 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -243,7 +244,7 @@
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<option name="MAIN_CLASS_NAME" value="com.structix.Main" />
<option name="VM_PARAMETERS" value="" />
<option name="PROGRAM_PARAMETERS" value="Beispieltext.txt -tl" />
<option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
@@ -671,11 +672,12 @@
<workItem from="1464077414443" duration="837000" />
<workItem from="1464104232545" duration="6138000" />
<workItem from="1464163482304" duration="4482000" />
<workItem from="1464252786359" duration="2503000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="44641000" />
<option name="totallyTimeSpent" value="47144000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="2560" height="1398" extended-state="6" />
@@ -750,7 +752,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -798,7 +805,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -846,7 +858,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -894,7 +911,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -942,7 +964,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1782">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -982,7 +1009,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1782">
<caret line="103" column="5" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="5" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1014,7 +1046,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1046,7 +1083,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="486">
<caret line="30" column="20" selection-start-line="30" selection-start-column="20" selection-end-line="30" selection-end-column="20" />
<folding />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
@@ -1090,6 +1132,19 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/Menubuilder.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding>
<element signature="e#247#248#0" expanded="false" />
<element signature="e#283#284#0" expanded="false" />
<element signature="e#2490#2491#0" expanded="false" />
<element signature="e#2531#2532#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Test.txt">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36">
@@ -1098,42 +1153,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/Menubuilder.java">
<entry file="file://$PROJECT_DIR$/src/com/structix/Analyse.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2088">
<caret line="120" column="0" selection-start-line="120" selection-start-column="0" selection-end-line="120" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/CommandLineInterface.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="809">
<caret line="109" column="34" selection-start-line="109" selection-start-column="34" selection-end-line="109" selection-end-column="34" />
<state relative-caret-position="1006">
<caret line="282" column="115" selection-start-line="282" selection-start-column="115" selection-end-line="282" selection-end-column="115" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="503">
<caret line="113" column="20" selection-start-line="113" selection-start-column="20" selection-end-line="113" selection-end-column="20" />
<state relative-caret-position="448">
<caret line="93" column="22" selection-start-line="93" selection-start-column="22" selection-end-line="93" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/Analyse.java">
<entry file="file://$PROJECT_DIR$/src/com/structix/CommandLineInterface.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="521">
<caret line="235" column="50" selection-start-line="235" selection-start-column="50" selection-end-line="235" selection-end-column="50" />
<state relative-caret-position="1062">
<caret line="116" column="34" selection-start-line="116" selection-start-column="34" selection-end-line="116" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/com/structix/Main.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540">
<caret line="30" column="30" selection-start-line="30" selection-start-column="30" selection-end-line="30" selection-end-column="30" />
<state relative-caret-position="556">
<caret line="31" column="30" selection-start-line="31" selection-start-column="30" selection-end-line="31" selection-end-column="30" />
<folding />
</state>
</provider>

BIN
out/production/Textanalyse/com/structix/Analyse.class
View File

Binary file not shown.

BIN
out/production/Textanalyse/com/structix/CommandLineInterface.class
View File

Binary file not shown.

BIN
out/production/Textanalyse/com/structix/Main.class
View File

Binary file not shown.

BIN
out/production/Textanalyse/com/structix/Menu.class
View File

Binary file not shown.

28
src/com/structix/Analyse.java
View File

@@ -259,4 +259,32 @@ public class Analyse {
return max;
}
public String hauefigkeitBuchstaben(String muster) {
char buchstaben[] = muster.toLowerCase().toCharArray();
int anzahl[] = new int[buchstaben.length];
char allebuchstaben[] = inhalt.toLowerCase().toCharArray();
String output = "";
//Anzahl Array mit 0 initialisieren
for (int i = 0; i < anzahl.length; i++) {
anzahl[i] = 0;
}
for (int i = 0; i < allebuchstaben.length; i++) {
for (int z = 0; z < buchstaben.length; z++) {
if (allebuchstaben[i] == buchstaben[z]) {
anzahl[z] += 1;
}
}
}
for (int i = 0; i < buchstaben.length; i++) {
output += buchstaben[i] + ": " + anzahl[i] + " (" + prozentsatz(anzahl[i], allebuchstaben.length) + "%)\n";
}
return output;
}
}

17
src/com/structix/CommandLineInterface.java
View File

@@ -9,11 +9,14 @@ public class CommandLineInterface {
private String cmds[];
private String cmdseinzeln[];
private String kommandos[] = {"-h", "-?", "--help", "--credits", "-w", "-v", "-b", "-ha", "-sl", "-tw", "-tb", "-tl"};
private String kommandos[] = {"-h", "-?", "--help", "--credits", "-w", "-v", "-b", "-ha", "-sl", "-tw", "-tb",
"-tl", "-bz"};
private String hilfe[] = {"Hilfe", "Hilfe", "Hilfe", "Credits", "Anzahl der Wörter",
"Anzahl der verwschiedenen Wörter", "Anzahl der Buchstaben", "Häufigkeit der Wörter",
"Anteil der Leerzeichen im Text", "Textformatierung nach Anzahl der Wörter pro Zeile",
"Textformatierung nach Anzahl der Buchstaben pro Zeile", "Textformatierung: Längstes Wort"};
"Textformatierung nach Anzahl der Buchstaben pro Zeile", "Textformatierung: Längstes Wort",
"Buchstaben zählen"};
String dateipfad = "";
int dateipfadstelle = -1;
@@ -108,6 +111,10 @@ public class CommandLineInterface {
case "-tl":
System.out.println("Buchstaben des längsten Wortes: " + an.laengstesWort());
break;
case "-bz":
System.out.println("Bitte geben Sie alle Buchstaben ein, wonach gesucht werden soll (Bsp.: abcd): ");
System.out.println(an.hauefigkeitBuchstaben(eingabe.nextLine()));
break;
}
}
}
@@ -135,15 +142,15 @@ public class CommandLineInterface {
String tempCmds[] = new String[cmds.length];
boolean vorhanden;
int tbelegt = 0;
for (int i = 0; i < cmds.length; i++) {
for (String cmd : cmds) {
vorhanden = false;
for (int z = 0; z < tempCmds.length; z++) {
if (cmds[i].equals(tempCmds[z])) {
if (cmd.equals(tempCmds[z])) {
vorhanden = true;
}
}
if (!vorhanden) {
tempCmds[tbelegt] = cmds[i];
tempCmds[tbelegt] = cmd;
tbelegt++;
}
}

1
src/com/structix/Main.java
View File

@@ -29,6 +29,7 @@ package com.structix;
* 20.05.16: 11:18 - 12:32 Uhr
* 24:05.16: 17:46 - 19:17 Uhr
* 25.05.16: 10:47 - 11:32 Uhr
* 26.05.16: 11:34 - 11:57 Uhr
*/
public class Main {

9
src/com/structix/Menu.java
View File

@@ -76,7 +76,7 @@ public class Menu {
boolean exit = false;
int auswahl = 0;
//Menü wird wieder mit Strings befüllt und der Rückgabe Wert der Variable auswahl zugeordnet
auswahl = statsmenu.menuAnzeigen(new String[]{"Enthaltene Leerzeichen", "Häufigkeit der verschiedenen Wörter"}, "||");
auswahl = statsmenu.menuAnzeigen(new String[]{"Enthaltene Leerzeichen", "Häufigkeit der verschiedenen Wörter", "Häufigkeit aller Buchstaben", "Häufigkeit einzelner Buchstaben"}, "||");
//Fallunterscheidung der Variable auswahl
switch (auswahl) {
case 1:
@@ -85,6 +85,13 @@ public class Menu {
case 2:
ausgabe(an.haeufigkeit());
break;
case 3:
System.out.println(an.hauefigkeitBuchstaben("abcdefghijklmnopqrstuvwxyz"));
break;
case 4:
System.out.println("Bitte geben Sie alle Buchstaben ein, wonach gesucht werden soll (Bsp.: abcd): ");
System.out.println(an.hauefigkeitBuchstaben(eingabe.nextLine()));
break;
default:
exit = true;
break; //Nicht zwingend notwendig