vanBos/S1_Aufgaben
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring + add 2

Browse Source
This commit is contained in:
Matti 2024-04-12 13:07:01 +02:00
parent 700dd3ee08
commit 805bf52715
10 changed files with 199 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
.idea/uiDesigner.xml Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

2
README.md
View File

@ -9,7 +9,7 @@ Dateien wie Bilder die zur Lösung einer Aufgabe gehören sind in <br><ins>Medie
- Vorlesung 3 komplett
- Vorlesung 4 komplett
- Vorlesung 5 Aufgabe 1 & 3 von 3
- Vorlesung 6 Aufgabe 1
- Vorlesung 6 Aufgabe 1 & 2
## Angefangene unfertige Lösungen:
- Damenproblem: VL 5 Aufgabe 2

4
src/part6/Angestellter.java → src/part6/aufg1/Angestellter.java
View File

@ -1,6 +1,6 @@
package part6;
package part6.aufg1;
class Angestellter extends Mitarbeiter{
class Angestellter extends Mitarbeiter {
double monatsGehalt;

3
src/part6/Anwendung.java → src/part6/aufg1/Anwendung.java
View File

@ -1,4 +1,5 @@
package part6;
package part6.aufg1;
public class Anwendung {
public static void main(String[] args){

4
src/part6/Arbeiter.java → src/part6/aufg1/Arbeiter.java
View File

@ -1,6 +1,6 @@
package part6;
package part6.aufg1;
class Arbeiter extends Mitarbeiter{
class Arbeiter extends Mitarbeiter {
double stundenSatz;

4
src/part6/Facharbeiter.java → src/part6/aufg1/Facharbeiter.java
View File

@ -1,6 +1,6 @@
package part6;
package part6.aufg1;
final class Facharbeiter extends Arbeiter{
final class Facharbeiter extends Arbeiter {
String fachRichtung;

4
src/part6/Leitender_Angestellter.java → src/part6/aufg1/Leitender_Angestellter.java
View File

@ -1,6 +1,6 @@
package part6;
package part6.aufg1;
public class Leitender_Angestellter extends Angestellter{
public class Leitender_Angestellter extends Angestellter {
int bonus;
Leitender_Angestellter(int persoNR, String name, String vorname, double monatsgehalt, int bonus){

4
src/part6/Manager.java → src/part6/aufg1/Manager.java
View File

@ -1,6 +1,6 @@
package part6;
package part6.aufg1;
public class Manager extends Leitender_Angestellter{
public class Manager extends Leitender_Angestellter {
String wagentyp;
String kennzeichen;

2
src/part6/Mitarbeiter.java → src/part6/aufg1/Mitarbeiter.java
View File

@ -1,4 +1,4 @@
package part6;
package part6.aufg1;
abstract class Mitarbeiter{
int personalNummer;

61
src/part6/aufg2/matrix.java Normal file
View File

@ -0,0 +1,61 @@
package part6.aufg2;
public class matrix {
int rows;
int cols;
int[][] field;
matrix(int rows, int cols){
this.rows = rows;
this.cols = cols;
field = new int[rows][cols];
}
void print(){
for (int i=0; i<this.rows; i++){
for (int j=0; j<this.cols; j++){
System.out.print(field[i][j]);
if (j != this.cols-1) {
System.out.print(" ; ");
}
}
System.out.println();
}
System.out.println("===========");
}
void setValue(int row, int col, int value){field[row][col] = value;}
int getValue(int row, int col){return field[row][col];}
void scalarMultiply(int factor){
for (int i=0; i<this.rows; i++) {
for (int j = 0; j < this.cols; j++) {
field[i][j] *= factor;
}
}
}
void addMatrix(matrix matrix2){
for (int i=0; i<this.rows; i++) {
for (int j = 0; j < this.cols; j++) {
field[i][j] += matrix2.field[i][j];
}
}
}
public static void main(String[] args){
matrix nr1 = new matrix(2,3);
matrix nr2 = new matrix(2,3);
nr1.setValue(1,1,1);
nr2.setValue(0,0,4);
nr2.addMatrix(nr1);
nr2.print();
nr2.scalarMultiply(8);
nr2.print();
}
}