diff --git a/.idea/ProjektGraph.iml b/.idea/ProjektGraph.iml index b107a2d..d6ebd48 100644 --- a/.idea/ProjektGraph.iml +++ b/.idea/ProjektGraph.iml @@ -2,9 +2,7 @@ - - - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 20f033c..639900d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 78ceab7..3c30cd6 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,75 +1,31 @@ - - - - - - - - - - - + - - - - - - - { - "associatedIndex": 2 -} + - - - - - - - - - - - - @@ -79,39 +35,6 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/Main.java b/Main.java deleted file mode 100644 index 9e0b29a..0000000 --- a/Main.java +++ /dev/null @@ -1,31 +0,0 @@ -import OurApplication.*; -import graph.EdgeMarking; -import graph.MarkedEdge; -import graph.MarkedVertex; -import graph.VertexMarking; -import visualisation.*; -import logging.*; -import visualisation.TextArea; - -import javax.swing.*; -import java.awt.*; - -public class Main { - public static void main(String[] args){ - JFrame t = new JFrame("Hallo"); - JPanel contentPane = new JPanel(new GridLayout()); - t.setSize(900, 900); - t.setContentPane(contentPane); - LogElementListlogList=new LogElementList(); - OurParameterArea parameterArea=new OurParameterArea(); - OurDrawArea drawArea=new OurDrawArea(logList,"visualizationTest"); - OurTextArea textArea=new OurTextArea(logList); - OurAlgorithm algorithm=new OurAlgorithm(parameterArea); - OurLegendArea legendArea=new OurLegendArea(); - HybridWindow test = new HybridWindow(drawArea,textArea,parameterArea,algorithm,logList,legendArea); - test.init(); - - contentPane.add(test); - t.setVisible(true); - } -} diff --git a/logging/Algorithm.class b/Neuer Ordner/workspace/visualizationFramework/src/logging/Algorithm.class similarity index 100% rename from logging/Algorithm.class rename to Neuer Ordner/workspace/visualizationFramework/src/logging/Algorithm.class diff --git a/logging/Algorithm.java b/Neuer Ordner/workspace/visualizationFramework/src/logging/Algorithm.java similarity index 93% rename from logging/Algorithm.java rename to Neuer Ordner/workspace/visualizationFramework/src/logging/Algorithm.java index 9bca2be..0898250 100644 --- a/logging/Algorithm.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/logging/Algorithm.java @@ -1,7 +1,6 @@ package logging; -import visualisation.HybridWindow; -import visualisation.ParameterArea; +import visualization.ParameterArea; /** * This class provides the basic algorithm. @@ -11,9 +10,9 @@ import visualisation.ParameterArea; * Parameters for algorithm processing are read from member parameterArea that ist part of the user interface. * @see logging.LogElement * @see logging.LogElementList - * @see HybridWindow - * @see ParameterArea - * @author Bj�rn Strobel
+ * @see visualization.HybridWindow + * @see visualization.ParameterArea + * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/logging/LogElement.class b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElement.class similarity index 100% rename from logging/LogElement.class rename to Neuer Ordner/workspace/visualizationFramework/src/logging/LogElement.class diff --git a/logging/LogElement.java b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElement.java similarity index 90% rename from logging/LogElement.java rename to Neuer Ordner/workspace/visualizationFramework/src/logging/LogElement.java index feda38b..67f2600 100644 --- a/logging/LogElement.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElement.java @@ -1,10 +1,5 @@ package logging; -import graph.DirectedGraph; -import graph.EdgeMarking; -import graph.VertexMarking; -import visualisation.HybridWindow; - /** * This class provides the basic log list element. * Use it in assoziation with packages logging and visualization. @@ -12,8 +7,8 @@ import visualisation.HybridWindow; * Extend it by the members you need. * @see logging.Algorithm * @see logging.LogElementList - * @see HybridWindow - * @author Bj�rn Strobel
+ * @see visualization.HybridWindow + * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/logging/LogElementList.class b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElementList.class similarity index 100% rename from logging/LogElementList.class rename to Neuer Ordner/workspace/visualizationFramework/src/logging/LogElementList.class diff --git a/logging/LogElementList.java b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElementList.java similarity index 95% rename from logging/LogElementList.java rename to Neuer Ordner/workspace/visualizationFramework/src/logging/LogElementList.java index 355a25b..6a557a2 100644 --- a/logging/LogElementList.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/logging/LogElementList.java @@ -1,7 +1,5 @@ package logging; -import visualisation.HybridWindow; - import java.util.Vector; /** @@ -10,9 +8,9 @@ import java.util.Vector; * In general you will not have to extend this class so it is final. * @see logging.Algorithm * @see logging.LogElement - * @see HybridWindow + * @see visualization.HybridWindow * @see java.util.Vector - * @author Bj�rn Strobel
+ * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/logging/package.html b/Neuer Ordner/workspace/visualizationFramework/src/logging/package.html similarity index 100% rename from logging/package.html rename to Neuer Ordner/workspace/visualizationFramework/src/logging/package.html diff --git a/testApplication/TestAlgorithm.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestAlgorithm.java similarity index 100% rename from testApplication/TestAlgorithm.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestAlgorithm.java diff --git a/testApplication/TestApplication.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestApplication.java similarity index 97% rename from testApplication/TestApplication.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestApplication.java index 2d00f5f..0979065 100644 --- a/testApplication/TestApplication.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestApplication.java @@ -3,7 +3,7 @@ package testApplication; import javax.swing.JFrame; import logging.LogElementList; -import visualisation.HybridWindow; +import visualization.HybridWindow; /** * This application provides an example for using logging and visualization packages. @@ -17,7 +17,7 @@ import visualisation.HybridWindow; * @see testApplication.TestTextArea * @see testApplication.TestLegendArea * @see javax.swing.JPanel - * @author MSch�fer + * @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/TestDrawArea.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestDrawArea.java similarity index 99% rename from testApplication/TestDrawArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestDrawArea.java index ffdd223..7d702eb 100644 --- a/testApplication/TestDrawArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestDrawArea.java @@ -4,7 +4,7 @@ import java.awt.Color; import java.awt.Graphics; import java.util.Vector; -import visualisation.DrawArea; +import visualization.DrawArea; import visualizationElements.BarChart; import visualizationElements.BarChartElement; import visualizationElements.ChessBoard; @@ -25,7 +25,7 @@ import logging.LogElementList; /** * This class provides an example for using visualization.DrawArea. * @see logging.Algorithm - @author MSch�fer + @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/TestHybridWindow.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestHybridWindow.java similarity index 91% rename from testApplication/TestHybridWindow.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestHybridWindow.java index a24999b..142fbb1 100644 --- a/testApplication/TestHybridWindow.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestHybridWindow.java @@ -1,15 +1,15 @@ package testApplication; import logging.LogElementList; -import visualisation.HybridWindow; +import visualization.HybridWindow; /** * This class provides an example for using visualization.HybridWindow. * Overwriting the constructor is necessary to run as an applet. * For running as an application overwriting the constructor is not necessary - * @see HybridWindow + * @see visualization.HybridWindow * @see testApplication.TestApplication - * @author MSch�fer + * @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/TestLegendArea.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestLegendArea.java similarity index 94% rename from testApplication/TestLegendArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestLegendArea.java index d5366ac..c5d0329 100644 --- a/testApplication/TestLegendArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestLegendArea.java @@ -3,12 +3,12 @@ package testApplication; import java.awt.Dimension; import java.awt.Graphics; import javax.swing.BorderFactory; -import visualisation.LegendArea; +import visualization.LegendArea; /** * This class represents a visualization.LegendArea implementation and has been created for demonstration purposes only. * Method initialize(Graphics) is overridden and now implements logic for drawing parameters on the legend area. - * @author MSch�fer + * @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/TestLogElement.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestLogElement.java similarity index 100% rename from testApplication/TestLogElement.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestLogElement.java diff --git a/testApplication/TestParameterArea.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestParameterArea.java similarity index 87% rename from testApplication/TestParameterArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestParameterArea.java index fa01145..8a74c26 100644 --- a/testApplication/TestParameterArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestParameterArea.java @@ -2,12 +2,12 @@ package testApplication; import javax.swing.BorderFactory; import javax.swing.JTextField; -import visualisation.ParameterArea; +import visualization.ParameterArea; /** * This class provides an example for using visualization.ParameterArea. - * @see ParameterArea - * @author MSch�fer + * @see visualization.ParameterArea + * @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/TestTextArea.java b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestTextArea.java similarity index 90% rename from testApplication/TestTextArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestTextArea.java index 23461c4..d8ba813 100644 --- a/testApplication/TestTextArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/TestTextArea.java @@ -1,13 +1,13 @@ package testApplication; import logging.LogElementList; -import visualisation.TextArea; +import visualization.TextArea; /** * This class provides an example for using visualization.TextArea. * Constructors and print() method have been overwritten. - * @see TextArea - * @author MSch�fer + * @see visualization.TextArea + * @author MSchäfer * DHBW Stuttgart/Campus Horb AI2008
*
*/ diff --git a/testApplication/package.html b/Neuer Ordner/workspace/visualizationFramework/src/testApplication/package.html similarity index 100% rename from testApplication/package.html rename to Neuer Ordner/workspace/visualizationFramework/src/testApplication/package.html diff --git a/visualisation/DrawArea.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/DrawArea.class similarity index 100% rename from visualisation/DrawArea.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/DrawArea.class diff --git a/visualisation/DrawArea.java b/Neuer Ordner/workspace/visualizationFramework/src/visualization/DrawArea.java similarity index 97% rename from visualisation/DrawArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/DrawArea.java index 522abf5..c1c66bd 100644 --- a/visualisation/DrawArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/visualization/DrawArea.java @@ -1,7 +1,7 @@ /** * */ -package visualisation; +package visualization; import java.awt.Color; import java.awt.Graphics; @@ -19,9 +19,9 @@ import logging.LogElementList; * Parameters for algorithm processing are read from member parameterArea that ist part of the user interface. * @see logging.LogElement * @see logging.LogElementList - * @see HybridWindow + * @see visualization.HybridWindow * @see javax.swing.JPanel - * @author Bj�rn Strobel
+ * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/visualisation/HybridWindow$AutoBackwardListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoBackwardListener.class similarity index 100% rename from visualisation/HybridWindow$AutoBackwardListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoBackwardListener.class diff --git a/visualisation/HybridWindow$AutoButtonListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoButtonListener.class similarity index 100% rename from visualisation/HybridWindow$AutoButtonListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoButtonListener.class diff --git a/visualisation/HybridWindow$AutoForwardListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoForwardListener.class similarity index 100% rename from visualisation/HybridWindow$AutoForwardListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoForwardListener.class diff --git a/visualisation/HybridWindow$AutoSliderListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoSliderListener.class similarity index 100% rename from visualisation/HybridWindow$AutoSliderListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$AutoSliderListener.class diff --git a/visualisation/HybridWindow$FirstListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$FirstListener.class similarity index 100% rename from visualisation/HybridWindow$FirstListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$FirstListener.class diff --git a/visualisation/HybridWindow$LastListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$LastListener.class similarity index 100% rename from visualisation/HybridWindow$LastListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$LastListener.class diff --git a/visualisation/HybridWindow$NextListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$NextListener.class similarity index 100% rename from visualisation/HybridWindow$NextListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$NextListener.class diff --git a/visualisation/HybridWindow$PrevListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$PrevListener.class similarity index 100% rename from visualisation/HybridWindow$PrevListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$PrevListener.class diff --git a/visualisation/HybridWindow$StartListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$StartListener.class similarity index 100% rename from visualisation/HybridWindow$StartListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$StartListener.class diff --git a/visualisation/HybridWindow$StopListener.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$StopListener.class similarity index 100% rename from visualisation/HybridWindow$StopListener.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow$StopListener.class diff --git a/visualisation/HybridWindow.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow.class similarity index 100% rename from visualisation/HybridWindow.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow.class diff --git a/visualisation/HybridWindow.java b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow.java similarity index 98% rename from visualisation/HybridWindow.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow.java index e790c35..a2cab64 100644 --- a/visualisation/HybridWindow.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/visualization/HybridWindow.java @@ -1,4 +1,4 @@ -package visualisation; +package visualization; import java.lang.Math; @@ -12,6 +12,7 @@ import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import javax.swing.BorderFactory; +import javax.swing.BoxLayout; import javax.swing.ButtonGroup; import javax.swing.Icon; import javax.swing.JApplet; @@ -41,12 +42,12 @@ import logging.LogElementList; * @see logging.Algorithm * @see logging.LogElement * @see logging.LogElementList - * @see DrawArea - * @see ParameterArea - * @see TextArea - * @see LegendArea + * @see visualization.DrawArea + * @see visualization.ParameterArea + * @see visualization.TextArea + * @see visualization.LegendArea * @see javax.swing.JApplet - * @author Bj�rn Strobel
+ * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/visualisation/LegendArea.java b/Neuer Ordner/workspace/visualizationFramework/src/visualization/LegendArea.java similarity index 95% rename from visualisation/LegendArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/LegendArea.java index 2324b8a..abeeade 100644 --- a/visualisation/LegendArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/visualization/LegendArea.java @@ -1,4 +1,4 @@ -package visualisation; +package visualization; import java.awt.Graphics; @@ -9,7 +9,7 @@ import javax.swing.JScrollPane; * This class enables the user to add a legend area for describing the elements and symbols of an algorithm's visualization. * Override method initialize(Graphics) for drawing your legend area's graphical output. * @see javax.swing.JPanel - * @see HybridWindow + * @see visualization.HybridWindow * @author Fabian Hamm * DHBW Stuttgart Campus Horb */ diff --git a/visualisation/ParameterArea.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/ParameterArea.class similarity index 100% rename from visualisation/ParameterArea.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/ParameterArea.class diff --git a/visualisation/ParameterArea.java b/Neuer Ordner/workspace/visualizationFramework/src/visualization/ParameterArea.java similarity index 90% rename from visualisation/ParameterArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/ParameterArea.java index 2d36261..256f3d9 100644 --- a/visualisation/ParameterArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/visualization/ParameterArea.java @@ -1,7 +1,7 @@ /** * */ -package visualisation; +package visualization; import javax.swing.JPanel; import javax.swing.JScrollPane; @@ -10,9 +10,9 @@ import javax.swing.JScrollPane; * This class provides the basic parameter input area for an algorithm visualization. * Add the components and corresponding methods you need and use them in your algorithm. * @see logging.Algorithm - * @see HybridWindow + * @see visualization.HybridWindow * @see javax.swing.JPanel - * @author Bj�rn Strobel
+ * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/visualisation/TextArea.class b/Neuer Ordner/workspace/visualizationFramework/src/visualization/TextArea.class similarity index 100% rename from visualisation/TextArea.class rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/TextArea.class diff --git a/visualisation/TextArea.java b/Neuer Ordner/workspace/visualizationFramework/src/visualization/TextArea.java similarity index 93% rename from visualisation/TextArea.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/TextArea.java index caf19d2..2c48de3 100644 --- a/visualisation/TextArea.java +++ b/Neuer Ordner/workspace/visualizationFramework/src/visualization/TextArea.java @@ -1,7 +1,7 @@ /** * */ -package visualisation; +package visualization; import java.awt.Color; import java.awt.Font; @@ -20,12 +20,12 @@ import logging.LogElementList; * @see logging.Algorithm * @see logging.LogElement * @see logging.LogElementList - * @see DrawArea - * @see HybridWindow - * @see ParameterArea - * @see TextArea + * @see visualization.DrawArea + * @see visualization.HybridWindow + * @see visualization.ParameterArea + * @see visualization.TextArea * @see javax.swing.JTextArea - * @author Bj�rn Strobel
+ * @author Björn Strobel
* University of Cooperative Education Stuttgart, * Campus Horb
* Department of Information Technology
diff --git a/visualisation/package.html b/Neuer Ordner/workspace/visualizationFramework/src/visualization/package.html similarity index 100% rename from visualisation/package.html rename to Neuer Ordner/workspace/visualizationFramework/src/visualization/package.html diff --git a/visualizationElements/BarChart.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/BarChart.java similarity index 100% rename from visualizationElements/BarChart.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/BarChart.java diff --git a/visualizationElements/BarChartElement.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/BarChartElement.java similarity index 100% rename from visualizationElements/BarChartElement.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/BarChartElement.java diff --git a/visualizationElements/Cell.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Cell.java similarity index 100% rename from visualizationElements/Cell.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Cell.java diff --git a/visualizationElements/ChessBoard.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/ChessBoard.java similarity index 100% rename from visualizationElements/ChessBoard.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/ChessBoard.java diff --git a/visualizationElements/DotChart.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/DotChart.java similarity index 100% rename from visualizationElements/DotChart.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/DotChart.java diff --git a/visualizationElements/Edge.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Edge.java similarity index 100% rename from visualizationElements/Edge.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Edge.java diff --git a/visualizationElements/EdgeStyle.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/EdgeStyle.java similarity index 100% rename from visualizationElements/EdgeStyle.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/EdgeStyle.java diff --git a/visualizationElements/Graph.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Graph.java similarity index 100% rename from visualizationElements/Graph.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Graph.java diff --git a/visualizationElements/Hashtable.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Hashtable.java similarity index 100% rename from visualizationElements/Hashtable.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Hashtable.java diff --git a/visualizationElements/List.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/List.java similarity index 100% rename from visualizationElements/List.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/List.java diff --git a/visualizationElements/Maze.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Maze.java similarity index 100% rename from visualizationElements/Maze.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Maze.java diff --git a/visualizationElements/Queue.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Queue.java similarity index 100% rename from visualizationElements/Queue.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Queue.java diff --git a/visualizationElements/Stack.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Stack.java similarity index 100% rename from visualizationElements/Stack.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Stack.java diff --git a/visualizationElements/Table.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Table.java similarity index 100% rename from visualizationElements/Table.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Table.java diff --git a/visualizationElements/Vertex.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Vertex.java similarity index 100% rename from visualizationElements/Vertex.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/Vertex.java diff --git a/visualizationElements/VisualizationElement.java b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/VisualizationElement.java similarity index 100% rename from visualizationElements/VisualizationElement.java rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/VisualizationElement.java diff --git a/visualizationElements/package.html b/Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/package.html similarity index 100% rename from visualizationElements/package.html rename to Neuer Ordner/workspace/visualizationFramework/src/visualizationElements/package.html diff --git a/OurApplication/OurAlgorithm.java b/OurApplication/OurAlgorithm.java deleted file mode 100644 index 1947254..0000000 --- a/OurApplication/OurAlgorithm.java +++ /dev/null @@ -1,111 +0,0 @@ -package OurApplication; - -import graph.*; -import logging.Algorithm; -import logging.LogElementList; - -import java.awt.*; -import java.util.HashMap; -import java.util.PriorityQueue; -import java.util.Random; -import java.util.Vector; - -/** - * This class provides an example for using logging.Algorithm. - * It sums up integer number starting with 0 up to the maximum value specified in the parameter area. - * @see Algorithm - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurAlgorithm extends Algorithm{ - - public OurAlgorithm() { - super(); - } - /** - * Creates a sum up algorithm. - * @param parameterArea the sum up parameter area the algorithm gets its parameters from - */ - public OurAlgorithm(OurParameterArea parameterArea){ - super(parameterArea,"GraphAlgorithm"); - } - - /** - * Overwritten from super class. - * Runs the algorithm.. - * Returns the LogElementList produced by the algorithm processing. - * Adds integer number starting with 0 up to the maximum value. - * @return a LogElementList containing the algorithm processing single steps - */ - - - - public LogElementList run(){ - LogElementListlogList = new LogElementList(); - - /* - for(int x=1;x<=10;x++){ - Random random = new Random(); - DirectedGraph myGraph = new DirectedGraph<>(); - for (int i = 0; i < 10; i++) { - myGraph.addVertex(new MarkedVertex<>(String.valueOf(i), null, random.nextInt(i, 350), random.nextInt(i, 350))); - } - - for (MarkedVertex i: myGraph.getAllVertexes()) { - myGraph.addEdge(new MarkedEdge<>("a", i, myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())), null, random.nextInt(1, 10))); - } - - for (MarkedVertex i: myGraph.getAllVertexes()) { - myGraph.addEdge(new MarkedEdge<>("a", i, myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())), null, random.nextInt(1, 10))); - } - - try{ - logList.add(new OurLogElement(x, "Value", x, myGraph)); - } - catch(OutOfMemoryError e){ - - System.err.println("Out of memory"); - } - } - */ - - Random random = new Random(); - DirectedGraph myGraph = new DirectedGraph<>(); - for (int i = 0; i < 10; i++) { - - myGraph.addVertex(new MarkedVertex<>(random.nextInt(i, 350), random.nextInt(i, 350), String.valueOf(i) + " :", Color.BLACK , null)); - } - - for (MarkedVertex i: myGraph.getAllVertexes()) { - myGraph.addEdge(new MarkedEdge<>("a", i, myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())), null, random.nextInt(1, 10))); - } - - for (MarkedVertex i: myGraph.getAllVertexes()) { - myGraph.addEdge(new MarkedEdge<>("a", i, myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())), null, random.nextInt(1, 10))); - } - - MarkedVertex start = myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())); - MarkedVertex end = myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())); - - Vector> items = new Vector<>(); - items = myGraph.DikstraVisualization(start, end); - - for(DirectedGraph i : items){ - logList.add(new OurLogElement(1, "Value", 1, i)); - } - - return logList; - } - - - - //Erstelle eines zufälligen Graphen - //Auf den graphen Diktra aufrufen --> liefert Vektor mit Steps - //for each über die Steps und fügen sie zur Loglist hinzu - //return die Log list - - - - -} diff --git a/OurApplication/OurApplication.java b/OurApplication/OurApplication.java deleted file mode 100644 index 235f330..0000000 --- a/OurApplication/OurApplication.java +++ /dev/null @@ -1,62 +0,0 @@ -package OurApplication; - -import graph.*; -import logging.LogElementList; -import visualisation.HybridWindow; - -import javax.swing.*; -import java.util.Random; - -/** - * This application provides an example for using logging and visualization packages. - * It uses extended classes from logging and visualization. - * @see OurAlgorithm - * @see OurApplication - * @see OurDrawArea - * @see OurHybridWindow - * @see OurLogElement - * @see OurParameterArea - * @see OurTextArea - * @see OurLegendArea - * @see javax.swing.JPanel - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurApplication { - - /** - * Standard constructor. - */ - public OurApplication() { - super(); - } - - /** - * The applications main method. - * Creates a HybridWindow with TestParameterArea, TestLegendArea ,TestDrawArea, TestTextArea and TestAlgorithm and starts it. - * @param args - */ - public static void main(String[]args){ - - - LogElementListlogList=new LogElementList(); - OurParameterArea parameterArea=new OurParameterArea(); - OurDrawArea drawArea=new OurDrawArea(logList,"GraphVisualization"); - OurTextArea textArea=new OurTextArea(logList); - OurAlgorithm algorithm=new OurAlgorithm(parameterArea); - OurLegendArea legendArea=new OurLegendArea(); - HybridWindow applet=new HybridWindow(drawArea,textArea,parameterArea,algorithm,logList,legendArea); - - - JFrame frame=new JFrame("Visualise"); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - frame.getContentPane().add(applet); - frame.pack(); - applet.init(); - applet.start(); - frame.setSize(800,600); - frame.setVisible(true); - } - -} diff --git a/OurApplication/OurDrawArea.java b/OurApplication/OurDrawArea.java deleted file mode 100644 index 14c24c7..0000000 --- a/OurApplication/OurDrawArea.java +++ /dev/null @@ -1,98 +0,0 @@ -package OurApplication; - -import graph.*; -import logging.LogElement; -import logging.LogElementList; -import visualisation.DrawArea; -import visualizationElements.Edge; -import visualizationElements.Graph; -import visualizationElements.List; -import visualizationElements.Queue; -import visualizationElements.*; -import visualizationElements.Vertex; - -import java.awt.*; -import java.util.Vector; - -/** - * This class provides an example for using visualization.DrawArea. - * @see logging.Algorithm - @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurDrawArea extends DrawArea{ - - private static final long serialVersionUID = 1L; - - - /** - * Standard constructor. - */ - public OurDrawArea() { - super(); - } - - /** - * Creates a test draw area and sets the specified log list. - * @param logList the draw area's log list test log elements. - * @param drawAreaName The display name over the draw area. - */ - public OurDrawArea(LogElementList logList, String drawAreaName){ - super(logList, drawAreaName); - } - - /** - * Draws a visualization element. - */ - - public void draw(Graphics g){ - - OurLogElement logElement=(OurLogElement)logList.get(); - drawGraph(logElement.getGraph(), g); - - } - - private void drawGraph(DirectedGraph ourGraph, Graphics g) { - String convertedMarking; - - /*Vector vertexes = new Vector(); - - for(MarkedVertex i : ourGraph.getAllVertexes()){ - if(i.getMarking() != null){ - convertedMarking = i.getMarking().toString(); - }else{ - convertedMarking = ""; - } - vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), convertedMarking, Color.GRAY)); - } - - Vector edges = new Vector(); - - for(MarkedEdge i : ourGraph.getAllEdges()){ - edges.add(new Edge(vertexes.get(0), vertexes.get(5), "i.getMarking()", Color.BLACK)); - } - - Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct); - - graph.draw(g);*/ - - Vector vertexes = new Vector(); - - for(MarkedVertex i : ourGraph.getAllVertexes()){ - - vertexes.add(new Vertex(i.getXCoordinate(), i.getYCoordinate(), i.getName()+i.getDistance(), i.getColor())); - } - - Vector edges = new Vector(); - - for(MarkedEdge i : ourGraph.getAllEdges()){ - edges.add(new Edge(i.getSource(), i.getDestination(), "i.getMarking()", Color.BLACK)); - } - - Graph graph = new Graph(vertexes, edges, true, EdgeStyle.Direct); - - graph.draw(g); - - } -} diff --git a/OurApplication/OurHybridWindow.java b/OurApplication/OurHybridWindow.java deleted file mode 100644 index 05c5759..0000000 --- a/OurApplication/OurHybridWindow.java +++ /dev/null @@ -1,33 +0,0 @@ -package OurApplication; - -import logging.LogElementList; -import visualisation.HybridWindow; - -/** - * This class provides an example for using visualization.HybridWindow. - * Overwriting the constructor is necessary to run as an applet. - * For running as an application overwriting the constructor is not necessary - * @see HybridWindow - * @see OurApplication - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurHybridWindow extends HybridWindow{ - - /** - * Overwritten standard constructor. - * Creates a TestUpHybridWindow with - * TestParameterArea,SumUpLegendArea, TestDrawArea, TestTextArea, - * TestAlgorithm and a LogElementList of TestLogElements. - */ - public OurHybridWindow() { - super(); - logList=new LogElementList(); - parameterArea=new OurParameterArea(); - drawArea=new OurDrawArea(logList,"visualization"); - textArea=new OurTextArea(logList); - legendArea=new OurLegendArea(); - algorithm=new OurAlgorithm((OurParameterArea)parameterArea); - } -} diff --git a/OurApplication/OurLegendArea.java b/OurApplication/OurLegendArea.java deleted file mode 100644 index 65fe640..0000000 --- a/OurApplication/OurLegendArea.java +++ /dev/null @@ -1,39 +0,0 @@ -package OurApplication; - -import visualisation.LegendArea; - -import javax.swing.*; -import java.awt.*; - -/** - * This class represents a visualization.LegendArea implementation and has been created for demonstration purposes only. - * Method initialize(Graphics) is overridden and now implements logic for drawing parameters on the legend area. - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurLegendArea extends LegendArea{ - - private static final long serialVersionUID = 1L; - - /** - * Standard constructor - */ - public OurLegendArea(){ - super(); - - //set the legend area's preferred size manually for best visualization - setPreferredSize(new Dimension(150, 170)); - } - - /** - * Overridden method from super class. - * Draws all elements and descriptions on the LegendArea - * @param g the Graphics object of the corresponding panel - */ - public void initialize(Graphics g){ - - //Create a new TitledBorder for the LegendArea - setBorder(BorderFactory.createTitledBorder("LegendArea")); - } -} \ No newline at end of file diff --git a/OurApplication/OurLogElement.java b/OurApplication/OurLogElement.java deleted file mode 100644 index 1e17bb7..0000000 --- a/OurApplication/OurLogElement.java +++ /dev/null @@ -1,57 +0,0 @@ -package OurApplication; - -import graph.DirectedGraph; -import graph.EdgeMarking; -import graph.VertexMarking; -import logging.LogElement; - -/** - * This class provides an example for using logging.LogElement. - * The super class has been extended by member value and corresponding get method. - * The standard constructor has been overwritten and a new one has been introduced. - * @see LogElement - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurLogElement extends LogElement{ - - /** The log elements sum up value. */ - protected long value; - protected DirectedGraph ourGraph; - - /** - * Standard constructor. - * Calls the constructor of super class and sets value 0. - */ - public OurLogElement() { - super(); - value=0; - } - - /** - * Extended constructor. - * Sets specified step number, description and sum up value. - * @param step the log element's step number - * @param description the log element's step description - * @param value the log element's sum up value - */ - public OurLogElement(int step, String description, long value, DirectedGraph ourGraph){ - this.step=step; - this.description=description; - this.value=value; - this.ourGraph = ourGraph; - } - - /** - * Returns the log element's sum up value. - * @return the log element's sum up value - */ - public long getValue(){ - return value; - } - public DirectedGraph getGraph(){ - return this.ourGraph; - } - -} diff --git a/OurApplication/OurParameterArea.java b/OurApplication/OurParameterArea.java deleted file mode 100644 index 7c4a4a3..0000000 --- a/OurApplication/OurParameterArea.java +++ /dev/null @@ -1,32 +0,0 @@ -package OurApplication; - -import visualisation.ParameterArea; - -import javax.swing.*; - -/** - * This class provides an example for using visualization.ParameterArea. - * @see ParameterArea - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurParameterArea extends ParameterArea{ - - private static final long serialVersionUID = 1L; - - /** TextField containing maximum sum up value. */ - protected JTextField maxValue; - - /** - * Standard constructor. - * Creates SumUpParameterArea with an empty JTextField. - */ - public OurParameterArea() { - super(); - setBorder(BorderFactory.createTitledBorder("ParameterArea")); - } - - - -} diff --git a/OurApplication/OurTextArea.java b/OurApplication/OurTextArea.java deleted file mode 100644 index 1e1e077..0000000 --- a/OurApplication/OurTextArea.java +++ /dev/null @@ -1,41 +0,0 @@ -package OurApplication; - -import logging.LogElementList; -import visualisation.TextArea; - -/** - * This class provides an example for using visualization.TextArea. - * Constructors and print() method have been overwritten. - * @see TextArea - * @author MSch�fer - * DHBW Stuttgart/Campus Horb AI2008
- *
- */ -public class OurTextArea extends TextArea{ - - private static final long serialVersionUID = 1L; - - /** - * Standard constructor. - */ - public OurTextArea() { - super(); - } - - /** - * Extended constructor. - * Sets LogElementList of TestLogElements as log list. - * @param logList the text area's log element list. - */ - public OurTextArea(LogElementListlogList){ - super(logList); - } - - /** - * Textual output of a log element. - * No output. - */ - public boolean print(){ - return true; - } -} diff --git a/graph/DirectedGraph.java b/graph/DirectedGraph.java index 32cf841..9c0a6e0 100644 --- a/graph/DirectedGraph.java +++ b/graph/DirectedGraph.java @@ -1,8 +1,6 @@ package graph; -import java.awt.*; import java.util.HashMap; -import java.util.List; import java.util.Objects; import java.util.PriorityQueue; import java.util.Vector; @@ -191,227 +189,4 @@ public class DirectedGraph exten // Gibt Distanz zu gefragtem Knoten zurück return distance.get(n2); } - - - /* - public Vector DikstraVisualization(MarkedVertex n1, MarkedVertex n2){ - - //Vektor mit einzelnen zu visualisierenden Graphen - Vector steps = new Vector(); - - - - // Erstellt Hashmap um Distanz von Startnoten zu jedem Knoten auf dem Graph zu tracken - // Erstellt Hashmap um zu tracken welche Knoten schon besucht wurden - // Initialisierung aller Distanzen auf UNENDLICH (= -1) - // Initialisierung, dass kein Knoten besucht wurde - HashMap, Integer> distance = new HashMap<>(); - HashMap, Boolean> visited = new HashMap<>(); - for (MarkedVertex i: this.getAllVertexes()) { - distance.put(i, -1); - i.setDistance(-1); - visited.put(i, false); - i.setColor(Color.GRAY); - } - n1.setColor(Color.RED); - n1.setName("Start: "); - n2.setColor(Color.RED); - n2.setName("Ende: "); - - - - // Erstelle Schlange wo die nächsten Verbindungen drin sind - PriorityQueue> queue = new PriorityQueue<>(new WrapperComparator()); - - // Distanz zu Startknoten auf 0 - // Weg zu Startknoten in die Schlange aufnehmen - distance.put(n1, 0); - n1.setDistance(0); - queue.add(new WrapperElement<>(n1, 0)); - - // Variable, die Distanz zwischen aktuellem Knoten und Nachfolger speichert - int dist = 0; - - - // Erste Visualisierung: alle Knoten grau, Start und Ende rot - DirectedGraph initialGraph = new DirectedGraph<>(); - for (MarkedVertex vertex : this.getAllVertexes()) { - initialGraph.addVertex(vertex); - } - for (MarkedEdge edge : this.getAllEdges()) { - initialGraph.addEdge(edge); - } - steps.add(initialGraph); - - while (!queue.isEmpty()) { - // Den nächsten Knoten, der am wenigsten kostet, besuchen - WrapperElement nextVertex = queue.poll(); - - // Knoten als besucht makieren - visited.put(nextVertex.getElement(), true); - - System.out.println("Visit " + nextVertex.getElement().getName()); - - // Gehe von diesem Knoten aus alle erreichbaren Knoten durch - for (MarkedVertex i: this.getSuccessors(nextVertex.getElement())) { - - // Kante finde, die den jetzigen und nächsten Knoten verbindet - for (MarkedEdge j: this.getAllEdges()) { - if (j.getSource() == nextVertex.getElement() && j.getDestination() == i) { - - // Berechne Distanz zu nächstem Knoten - dist = distance.get(nextVertex.getElement()) + j.getWeighting(); - break; - } - } - - // Wenn es schon einen kürzeren Weg zum Knoten gibt, überspringen - if ((distance.get(i) <= dist && distance.get(i) != -1) || visited.get(i)) { - continue; - } - - // Aktualisiere Distanz von Start zu nächstem Knoten - distance.put(i, dist); - - System.out.println("Add " + i.getName() + " with " + dist + " weight to queue."); - - // Nehme nächsten Knoten in die Queue auf - queue.add(new WrapperElement<>(i, dist)); - } - } - - return steps; - } - */ - - public Vector> DikstraVisualization(MarkedVertex n1, MarkedVertex n2) { - // Vektor mit einzelnen zu visualisierenden Graphen - Vector> steps = new Vector<>(); - - // Erstellt Hashmap um Distanz von Startnoten zu jedem Knoten auf dem Graph zu tracken - // Erstellt Hashmap um zu tracken welche Knoten schon besucht wurden - // Initialisierung aller Distanzen auf UNENDLICH (= -1) - // Initialisierung, dass kein Knoten besucht wurde - HashMap, Integer> distance = new HashMap<>(); - HashMap, Boolean> visited = new HashMap<>(); - for (MarkedVertex i : this.getAllVertexes()) { - distance.put(i, -1); - i.setDistance(-1); - visited.put(i, false); - i.setColor(Color.GRAY); - } - n1.setColor(Color.RED); - n1.setName("Start"); - n2.setColor(Color.RED); - n2.setName("Ende"); - - // Erstelle Schlange wo die nächsten Verbindungen drin sind - PriorityQueue> queue = new PriorityQueue<>(new WrapperComparator<>()); - - // Distanz zu Startknoten auf 0 - // Weg zu Startknoten in die Schlange aufnehmen - distance.put(n1, 0); - n1.setDistance(0); - queue.add(new WrapperElement<>(n1, 0)); - - // Variable, die Distanz zwischen aktuellem Knoten und Nachfolger speichert - int dist = 0; - - // Erste Visualisierung: alle Knoten grau, Start und Ende rot - DirectedGraph initialGraph = new DirectedGraph<>(); - for (MarkedVertex vertex : this.getAllVertexes()) { - initialGraph.addVertex(vertex); - } - for (MarkedEdge edge : this.getAllEdges()) { - initialGraph.addEdge(edge); - } - steps.add(initialGraph); - - while (!queue.isEmpty()) { - // Den nächsten Knoten, der am wenigsten kostet, besuchen - WrapperElement nextVertex = queue.poll(); - MarkedVertex current = nextVertex.getElement(); - - // Knoten als besucht makieren - visited.put(current, true); - current.setColor(Color.BLUE); // Aktueller Knoten wird blau - - // Erstelle eine Kopie des aktuellen Zustands und füge sie zu steps hinzu - DirectedGraph visitGraph = copyGraph(); - steps.add(visitGraph); - - System.out.println("Visit " + current.getName()); - - // Gehe von diesem Knoten aus alle erreichbaren Knoten durch - for (MarkedVertex i : this.getSuccessors(current)) { - if (visited.get(i)) continue; // Überspringe besuchte Knoten - - // Kante finde, die den jetzigen und nächsten Knoten verbindet - for (MarkedEdge j : this.getAllEdges()) { - if (j.getSource() == current && j.getDestination() == i) { - // Berechne Distanz zu nächstem Knoten - dist = distance.get(current) + j.getWeighting(); - break; - } - } - - // Wenn es schon einen kürzeren Weg zum Knoten gibt, überspringen - if ((distance.get(i) <= dist && distance.get(i) != -1) || visited.get(i)) { - continue; - } - - // Aktualisiere Distanz von Start zu nächstem Knoten - distance.put(i, dist); - i.setDistance(dist); - - System.out.println("Add " + i.getName() + " with " + dist + " weight to queue."); - - // Nehme nächsten Knoten in die Queue auf - queue.add(new WrapperElement<>(i, dist)); - - // Setze die Farbe des Knotens in der Warteschlange auf gelb - i.setColor(Color.YELLOW); - - // Erstelle eine Kopie des aktuellen Zustands und füge sie zu steps hinzu - DirectedGraph queueGraph = copyGraph(); - steps.add(queueGraph); - } - - // Setze die Farbe des besuchten Knotens auf grün - current.setColor(Color.GREEN); - - // Erstelle eine Kopie des aktuellen Zustands und füge sie zu steps hinzu - DirectedGraph visitedGraph = copyGraph(); - steps.add(visitedGraph); - } - - return steps; - } - - private DirectedGraph copyGraph() { - DirectedGraph newGraph = new DirectedGraph<>(); - for (MarkedVertex vertex : this.getAllVertexes()) { - MarkedVertex newVertex = new MarkedVertex<>(); - newVertex.setName(vertex.getName()); - newVertex.setColor(vertex.getColor()); - newVertex.setDistance(vertex.getDistance()); - newVertex.setMarking(vertex.getMarking()); - newVertex.setXCoordinate(vertex.getXCoordinate()); - newVertex.setYCoordinate(vertex.getYCoordinate()); - newGraph.addVertex(newVertex); - } - for (MarkedEdge edge : this.getAllEdges()) { - MarkedEdge newEdge = new MarkedEdge<>(); - newEdge.setName(edge.getName()); - newEdge.setMarking(edge.getMarking()); - newEdge.setWeighting(edge.getWeighting()); - newEdge.setSource(edge.getSource()); - newEdge.setDestination(edge.getDestination()); - newGraph.addEdge(newEdge); - } - return newGraph; - } - - - } diff --git a/graph/Display.java b/graph/Display.java index 57e9d43..93a3861 100644 --- a/graph/Display.java +++ b/graph/Display.java @@ -1,6 +1,5 @@ package graph; -import java.awt.*; import java.util.Random; public class Display { @@ -8,11 +7,10 @@ public class Display { public static void main(String[] args) { DirectedGraph myGraph = new DirectedGraph<>(); - Random random = new Random(); - for (int i = 0; i < 10; i++) { - myGraph.addVertex(new MarkedVertex<>(random.nextInt(i, 350), random.nextInt(i, 350), String.valueOf(i) + " :", Color.BLACK , null)); + myGraph.addVertex(new MarkedVertex<>(String.valueOf(i), null)); } + Random random = new Random(); for (MarkedVertex i: myGraph.getAllVertexes()) { myGraph.addEdge(new MarkedEdge<>("a", i, myGraph.getAllVertexes().get(random.nextInt(myGraph.getAllVertexes().size())), null, random.nextInt(1, 10))); diff --git a/graph/Graph.java b/graph/Graph.java index 51edd85..4e27005 100644 --- a/graph/Graph.java +++ b/graph/Graph.java @@ -7,7 +7,6 @@ public abstract class Graph { // ATTRIBUTE private String name; - private String description; private Vector> vertexes; private Vector> edges; @@ -32,10 +31,6 @@ public abstract class Graph { return this.name; } - public String getDescription() { - return this.description; - } - public Vector> getAllEdges() { return this.edges; @@ -53,10 +48,6 @@ public abstract class Graph { this.name = s; } - public void setDescription(String s) { - this.description = s; - } - // Ausgabe public String toString() { diff --git a/graph/MarkedVertex.java b/graph/MarkedVertex.java index 83af150..73081bb 100644 --- a/graph/MarkedVertex.java +++ b/graph/MarkedVertex.java @@ -1,7 +1,5 @@ package graph; -import java.awt.*; - public class MarkedVertex extends Vertex{ // ATTRIBUTE @@ -16,15 +14,15 @@ public class MarkedVertex extends Vertex{ } - public MarkedVertex(int xCoordinate, int yCoordinate, String name, Color color, T t) { - super(xCoordinate, yCoordinate, name, color); + public MarkedVertex(String s, T t) { + super(s); this.marking = t; } // GET-ER - /*public T getMarking() { + public T getMarking() { return this.marking; } @@ -33,7 +31,7 @@ public class MarkedVertex extends Vertex{ public void setMarking(T t) { this.marking = t; - }*/ + } // Ausgabe diff --git a/graph/Vertex.java b/graph/Vertex.java index cd051da..cdf7654 100644 --- a/graph/Vertex.java +++ b/graph/Vertex.java @@ -1,28 +1,21 @@ package graph; -import java.awt.Color; - -public abstract class Vertex extends visualizationElements.Vertex { +public abstract class Vertex { // ATTRIBUTE private String name; - private Color color; - private int distance; - private int xCoordinate; - private int yCoordinate; - // KONSTRUKTOREN public Vertex() { - super(0, 0); + this.name = ""; } - public Vertex(int xCoordinate, int yCoordinate, String name, Color color) { - super(xCoordinate, yCoordinate, name, color); + public Vertex(String s) { + this.name = s; } @@ -31,35 +24,13 @@ public abstract class Vertex extends visualizationElements.Vertex { public String getName() { return this.name; } - public Color getColor() { - return this.color; - } - public int getDistance() { - return this.distance; - } - public int getXCoordinate(){ - return this.xCoordinate; - } - public int getYCoordinate(){ - return this.yCoordinate; - } + + // SET-ER public void setName(String s) { this.name = s; } - public void setColor(Color s) { - this.color = s; - } - public void setDistance(int s) { - this.distance = s; - } - public void setXCoordinate(int xCoordinate){ - this.xCoordinate=xCoordinate; - } - public void setYCoordinate(int yCoordinate){ - this.yCoordinate=yCoordinate; - } } diff --git a/graph/VertexMarking.java b/graph/VertexMarking.java index c577d43..59257b9 100644 --- a/graph/VertexMarking.java +++ b/graph/VertexMarking.java @@ -1,5 +1,4 @@ package graph; public abstract class VertexMarking extends Marking { - private String mark; } diff --git a/out/production/ProjektGraph/.gitignore b/out/production/ProjektGraph/.gitignore new file mode 100644 index 0000000..6a3417b --- /dev/null +++ b/out/production/ProjektGraph/.gitignore @@ -0,0 +1 @@ +/out/ diff --git a/out/production/ProjektGraph/.idea/ProjektGraph.iml b/out/production/ProjektGraph/.idea/ProjektGraph.iml new file mode 100644 index 0000000..b107a2d --- /dev/null +++ b/out/production/ProjektGraph/.idea/ProjektGraph.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/ProjektGraph/.idea/misc.xml b/out/production/ProjektGraph/.idea/misc.xml new file mode 100644 index 0000000..20f033c --- /dev/null +++ b/out/production/ProjektGraph/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/ProjektGraph/.idea/modules.xml b/out/production/ProjektGraph/.idea/modules.xml new file mode 100644 index 0000000..cf75027 --- /dev/null +++ b/out/production/ProjektGraph/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/out/production/ProjektGraph/.idea/uiDesigner.xml similarity index 100% rename from .idea/uiDesigner.xml rename to out/production/ProjektGraph/.idea/uiDesigner.xml diff --git a/out/production/ProjektGraph/.idea/vcs.xml b/out/production/ProjektGraph/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/out/production/ProjektGraph/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/out/production/ProjektGraph/.idea/workspace.xml b/out/production/ProjektGraph/.idea/workspace.xml new file mode 100644 index 0000000..7dfa0db --- /dev/null +++ b/out/production/ProjektGraph/.idea/workspace.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + { + "associatedIndex": 2 +} + + + + + { + "keyToString": { + "Application.Display.executor": "Run", + "Application.OurApplication.executor": "Run", + "RunOnceActivity.ShowReadmeOnStart": "true", + "git-widget-placeholder": "Versuch__Christian", + "kotlin-language-version-configured": "true", + "last_opened_file_path": "C:/Git/ProjektGraphMain" + } +} + + + + + + + + + + + + + + 1718547365327 + + + + + + + \ No newline at end of file diff --git a/out/production/ProjektGraph/OurApplication/OurAlgorithm.class b/out/production/ProjektGraph/OurApplication/OurAlgorithm.class new file mode 100644 index 0000000..d674353 Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurAlgorithm.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurApplication.class b/out/production/ProjektGraph/OurApplication/OurApplication.class new file mode 100644 index 0000000..a6f780d Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurApplication.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurDrawArea.class b/out/production/ProjektGraph/OurApplication/OurDrawArea.class new file mode 100644 index 0000000..55b0777 Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurDrawArea.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurHybridWindow.class b/out/production/ProjektGraph/OurApplication/OurHybridWindow.class new file mode 100644 index 0000000..bd8f4f6 Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurHybridWindow.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurLegendArea.class b/out/production/ProjektGraph/OurApplication/OurLegendArea.class new file mode 100644 index 0000000..c4a44cc Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurLegendArea.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurLogElement.class b/out/production/ProjektGraph/OurApplication/OurLogElement.class new file mode 100644 index 0000000..5c5356a Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurLogElement.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurParameterArea.class b/out/production/ProjektGraph/OurApplication/OurParameterArea.class new file mode 100644 index 0000000..755d517 Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurParameterArea.class differ diff --git a/out/production/ProjektGraph/OurApplication/OurTextArea.class b/out/production/ProjektGraph/OurApplication/OurTextArea.class new file mode 100644 index 0000000..5ef8543 Binary files /dev/null and b/out/production/ProjektGraph/OurApplication/OurTextArea.class differ diff --git a/out/production/ProjektGraph/T3100 - Weiterentwicklung einer Klassenbibliothek zum Open Source Projekt .pdf b/out/production/ProjektGraph/T3100 - Weiterentwicklung einer Klassenbibliothek zum Open Source Projekt .pdf new file mode 100644 index 0000000..fa665cc Binary files /dev/null and b/out/production/ProjektGraph/T3100 - Weiterentwicklung einer Klassenbibliothek zum Open Source Projekt .pdf differ diff --git a/out/production/ProjektGraph/graph/DirectedGraph.class b/out/production/ProjektGraph/graph/DirectedGraph.class new file mode 100644 index 0000000..d0397d8 Binary files /dev/null and b/out/production/ProjektGraph/graph/DirectedGraph.class differ diff --git a/out/production/ProjektGraph/graph/Display.class b/out/production/ProjektGraph/graph/Display.class new file mode 100644 index 0000000..bbede03 Binary files /dev/null and b/out/production/ProjektGraph/graph/Display.class differ diff --git a/out/production/ProjektGraph/graph/Edge.class b/out/production/ProjektGraph/graph/Edge.class new file mode 100644 index 0000000..b320ec5 Binary files /dev/null and b/out/production/ProjektGraph/graph/Edge.class differ diff --git a/out/production/ProjektGraph/graph/EdgeMarking.class b/out/production/ProjektGraph/graph/EdgeMarking.class new file mode 100644 index 0000000..05ea7a9 Binary files /dev/null and b/out/production/ProjektGraph/graph/EdgeMarking.class differ diff --git a/out/production/ProjektGraph/graph/Graph.class b/out/production/ProjektGraph/graph/Graph.class new file mode 100644 index 0000000..00d3c30 Binary files /dev/null and b/out/production/ProjektGraph/graph/Graph.class differ diff --git a/out/production/ProjektGraph/graph/MarkedEdge.class b/out/production/ProjektGraph/graph/MarkedEdge.class new file mode 100644 index 0000000..5ee8adf Binary files /dev/null and b/out/production/ProjektGraph/graph/MarkedEdge.class differ diff --git a/out/production/ProjektGraph/graph/MarkedVertex.class b/out/production/ProjektGraph/graph/MarkedVertex.class new file mode 100644 index 0000000..d65fb26 Binary files /dev/null and b/out/production/ProjektGraph/graph/MarkedVertex.class differ diff --git a/out/production/ProjektGraph/graph/Marking.class b/out/production/ProjektGraph/graph/Marking.class new file mode 100644 index 0000000..811ff70 Binary files /dev/null and b/out/production/ProjektGraph/graph/Marking.class differ diff --git a/out/production/ProjektGraph/graph/NameDoesNotExistException.class b/out/production/ProjektGraph/graph/NameDoesNotExistException.class new file mode 100644 index 0000000..447f0e8 Binary files /dev/null and b/out/production/ProjektGraph/graph/NameDoesNotExistException.class differ diff --git a/out/production/ProjektGraph/graph/UndirectedGraph.class b/out/production/ProjektGraph/graph/UndirectedGraph.class new file mode 100644 index 0000000..8e5be8e Binary files /dev/null and b/out/production/ProjektGraph/graph/UndirectedGraph.class differ diff --git a/out/production/ProjektGraph/graph/Vertex.class b/out/production/ProjektGraph/graph/Vertex.class new file mode 100644 index 0000000..396a0b7 Binary files /dev/null and b/out/production/ProjektGraph/graph/Vertex.class differ diff --git a/out/production/ProjektGraph/graph/VertexMarking.class b/out/production/ProjektGraph/graph/VertexMarking.class new file mode 100644 index 0000000..cb96456 Binary files /dev/null and b/out/production/ProjektGraph/graph/VertexMarking.class differ diff --git a/out/production/ProjektGraph/graph/WrapperComparator.class b/out/production/ProjektGraph/graph/WrapperComparator.class new file mode 100644 index 0000000..3e475f1 Binary files /dev/null and b/out/production/ProjektGraph/graph/WrapperComparator.class differ diff --git a/out/production/ProjektGraph/graph/WrapperElement.class b/out/production/ProjektGraph/graph/WrapperElement.class new file mode 100644 index 0000000..f7c11db Binary files /dev/null and b/out/production/ProjektGraph/graph/WrapperElement.class differ diff --git a/out/production/ProjektGraph/logging/Algorithm.class b/out/production/ProjektGraph/logging/Algorithm.class new file mode 100644 index 0000000..beef63e Binary files /dev/null and b/out/production/ProjektGraph/logging/Algorithm.class differ diff --git a/out/production/ProjektGraph/logging/LogElement.class b/out/production/ProjektGraph/logging/LogElement.class new file mode 100644 index 0000000..b96efdb Binary files /dev/null and b/out/production/ProjektGraph/logging/LogElement.class differ diff --git a/out/production/ProjektGraph/logging/LogElementList.class b/out/production/ProjektGraph/logging/LogElementList.class new file mode 100644 index 0000000..1087dfc Binary files /dev/null and b/out/production/ProjektGraph/logging/LogElementList.class differ diff --git a/out/production/ProjektGraph/visualisation/DrawArea.class b/out/production/ProjektGraph/visualisation/DrawArea.class new file mode 100644 index 0000000..eecbdb4 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/DrawArea.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$AutoBackwardListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$AutoBackwardListener.class new file mode 100644 index 0000000..5c3c5c8 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$AutoBackwardListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$AutoButtonListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$AutoButtonListener.class new file mode 100644 index 0000000..a4b43f9 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$AutoButtonListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$AutoForwardListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$AutoForwardListener.class new file mode 100644 index 0000000..c99d7c2 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$AutoForwardListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$AutoSliderListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$AutoSliderListener.class new file mode 100644 index 0000000..f509925 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$AutoSliderListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$FirstListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$FirstListener.class new file mode 100644 index 0000000..85d47b2 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$FirstListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$LastListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$LastListener.class new file mode 100644 index 0000000..00454a6 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$LastListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$NextListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$NextListener.class new file mode 100644 index 0000000..5c8b205 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$NextListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$PauseButtonListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$PauseButtonListener.class new file mode 100644 index 0000000..2196ac8 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$PauseButtonListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$PrevListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$PrevListener.class new file mode 100644 index 0000000..bf3d0c9 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$PrevListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$StartListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$StartListener.class new file mode 100644 index 0000000..cbfd7ef Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$StartListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow$StopListener.class b/out/production/ProjektGraph/visualisation/HybridWindow$StopListener.class new file mode 100644 index 0000000..87a8c6b Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow$StopListener.class differ diff --git a/out/production/ProjektGraph/visualisation/HybridWindow.class b/out/production/ProjektGraph/visualisation/HybridWindow.class new file mode 100644 index 0000000..d794aa5 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/HybridWindow.class differ diff --git a/out/production/ProjektGraph/visualisation/LegendArea.class b/out/production/ProjektGraph/visualisation/LegendArea.class new file mode 100644 index 0000000..a7e780c Binary files /dev/null and b/out/production/ProjektGraph/visualisation/LegendArea.class differ diff --git a/out/production/ProjektGraph/visualisation/ParameterArea.class b/out/production/ProjektGraph/visualisation/ParameterArea.class new file mode 100644 index 0000000..ea8de7f Binary files /dev/null and b/out/production/ProjektGraph/visualisation/ParameterArea.class differ diff --git a/out/production/ProjektGraph/visualisation/TextArea.class b/out/production/ProjektGraph/visualisation/TextArea.class new file mode 100644 index 0000000..3c5f7b3 Binary files /dev/null and b/out/production/ProjektGraph/visualisation/TextArea.class differ diff --git a/out/production/ProjektGraph/visualizationElements/BarChart.class b/out/production/ProjektGraph/visualizationElements/BarChart.class new file mode 100644 index 0000000..c764d5f Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/BarChart.class differ diff --git a/out/production/ProjektGraph/visualizationElements/BarChartElement.class b/out/production/ProjektGraph/visualizationElements/BarChartElement.class new file mode 100644 index 0000000..d8e93fb Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/BarChartElement.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Cell.class b/out/production/ProjektGraph/visualizationElements/Cell.class new file mode 100644 index 0000000..f83e01b Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Cell.class differ diff --git a/out/production/ProjektGraph/visualizationElements/ChessBoard.class b/out/production/ProjektGraph/visualizationElements/ChessBoard.class new file mode 100644 index 0000000..0846bcf Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/ChessBoard.class differ diff --git a/out/production/ProjektGraph/visualizationElements/DotChart.class b/out/production/ProjektGraph/visualizationElements/DotChart.class new file mode 100644 index 0000000..c45f532 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/DotChart.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Edge.class b/out/production/ProjektGraph/visualizationElements/Edge.class new file mode 100644 index 0000000..9918f2e Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Edge.class differ diff --git a/out/production/ProjektGraph/visualizationElements/EdgeStyle.class b/out/production/ProjektGraph/visualizationElements/EdgeStyle.class new file mode 100644 index 0000000..f28677b Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/EdgeStyle.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Graph.class b/out/production/ProjektGraph/visualizationElements/Graph.class new file mode 100644 index 0000000..a0b2027 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Graph.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Hashtable.class b/out/production/ProjektGraph/visualizationElements/Hashtable.class new file mode 100644 index 0000000..d297142 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Hashtable.class differ diff --git a/out/production/ProjektGraph/visualizationElements/List.class b/out/production/ProjektGraph/visualizationElements/List.class new file mode 100644 index 0000000..1292147 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/List.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Maze.class b/out/production/ProjektGraph/visualizationElements/Maze.class new file mode 100644 index 0000000..6729592 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Maze.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Queue.class b/out/production/ProjektGraph/visualizationElements/Queue.class new file mode 100644 index 0000000..a7f00b3 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Queue.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Stack.class b/out/production/ProjektGraph/visualizationElements/Stack.class new file mode 100644 index 0000000..7ae9931 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Stack.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Table.class b/out/production/ProjektGraph/visualizationElements/Table.class new file mode 100644 index 0000000..531b8bc Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Table.class differ diff --git a/out/production/ProjektGraph/visualizationElements/Vertex.class b/out/production/ProjektGraph/visualizationElements/Vertex.class new file mode 100644 index 0000000..69aad0a Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/Vertex.class differ diff --git a/out/production/ProjektGraph/visualizationElements/VisualizationElement.class b/out/production/ProjektGraph/visualizationElements/VisualizationElement.class new file mode 100644 index 0000000..5601fb2 Binary files /dev/null and b/out/production/ProjektGraph/visualizationElements/VisualizationElement.class differ