From 24b3a8798578c0a6a3a231ea0ba02aedceb649bc Mon Sep 17 00:00:00 2001 From: "maxim.derksen" Date: Thu, 26 Nov 2020 10:58:50 +0100 Subject: [PATCH] abd --- DecisionTreeBuilder.java | 5 +- package.bluej | 144 +++++++++++++++++++++------------------ 2 files changed, 81 insertions(+), 68 deletions(-) diff --git a/DecisionTreeBuilder.java b/DecisionTreeBuilder.java index 5350689..64545fc 100644 --- a/DecisionTreeBuilder.java +++ b/DecisionTreeBuilder.java @@ -1,8 +1,8 @@ public class DecisionTreeBuilder { - public static final String TRAININGDATA = "titanic50.csv"; + //public static final String TRAININGDATA = "titanic50.csv"; //public static final String TRAININGDATA = "titanic300.csv"; - //public static final String TRAININGDATA = "titanic800.csv"; + public static final String TRAININGDATA = "titanic800.csv"; public static final String TESTDATA = "titanicTest.csv"; private int maxDepth; @@ -92,7 +92,6 @@ public class DecisionTreeBuilder { private void printTree( BinaryTree pTree, int pDepth ) { // Aktueller Inhalt der Wurzel des Teilbaumes DecisionNode k = pTree.getContent(); - // TODO: Ausgabe des Baumes implemeniteren // Mit k.toString() kann der Inhalt diff --git a/package.bluej b/package.bluej index 86457a0..6a2cf55 100644 --- a/package.bluej +++ b/package.bluej @@ -1,6 +1,6 @@ #BlueJ package file -dependency1.from=Classification -dependency1.to=Passenger +dependency1.from=FileSystem +dependency1.to=List dependency1.type=UsesDependency dependency10.from=DecisionTreeBuilder dependency10.to=ID3 @@ -14,16 +14,16 @@ dependency12.type=UsesDependency dependency13.from=DecisionTreeBuilder dependency13.to=FileSystem dependency13.type=UsesDependency -dependency2.from=Decision +dependency2.from=Classification dependency2.to=Passenger dependency2.type=UsesDependency -dependency3.from=FileSystem -dependency3.to=List +dependency3.from=ID3 +dependency3.to=Passenger dependency3.type=UsesDependency -dependency4.from=ID3 +dependency4.from=DecisionNode dependency4.to=Passenger dependency4.type=UsesDependency -dependency5.from=DecisionNode +dependency5.from=Decision dependency5.to=Passenger dependency5.type=UsesDependency dependency6.from=DecisionTreeBuilder @@ -38,22 +38,22 @@ dependency8.type=UsesDependency dependency9.from=DecisionTreeBuilder dependency9.to=Passenger dependency9.type=UsesDependency -editor.fx.0.height=722 -editor.fx.0.width=1031 -editor.fx.0.x=90 -editor.fx.0.y=24 -objectbench.height=66 -objectbench.width=1098 +editor.fx.0.height=1000 +editor.fx.0.width=1296 +editor.fx.0.x=-8 +editor.fx.0.y=-8 +objectbench.height=100 +objectbench.width=1256 package.divider.horizontal=0.6 -package.divider.vertical=0.8983286908077994 -package.editor.height=622 -package.editor.width=975 -package.editor.x=39 -package.editor.y=24 -package.frame.height=776 -package.frame.width=1122 +package.divider.vertical=0.881243063263041 +package.editor.height=787 +package.editor.width=1145 +package.editor.x=0 +package.editor.y=0 +package.frame.height=1000 +package.frame.width=1296 package.numDependencies=13 -package.numTargets=9 +package.numTargets=11 package.showExtends=true package.showUses=true project.charset=UTF-8 @@ -63,65 +63,79 @@ readme.width=47 readme.x=10 readme.y=10 target1.height=50 -target1.name=Classification +target1.name=BinaryTree$BTNode target1.showInterface=false -target1.type=ClassTarget -target1.width=110 -target1.x=120 -target1.y=200 +target1.type=SubTargetClassRole +target1.width=250 +target1.x=190 +target1.y=10 +target10.height=50 +target10.name=Passenger +target10.showInterface=false +target10.type=ClassTarget +target10.width=90 +target10.x=10 +target10.y=80 +target11.height=50 +target11.name=Decision +target11.showInterface=false +target11.type=ClassTarget +target11.width=110 +target11.x=530 +target11.y=200 target2.height=50 -target2.name=Decision +target2.name=List$ListNode target2.showInterface=false -target2.type=ClassTarget -target2.width=110 -target2.x=530 -target2.y=200 -target3.height=50 -target3.name=FileSystem +target2.type=SubTargetClassRole +target2.width=200 +target2.x=110 +target2.y=70 +target3.height=250 +target3.name=DecisionTreeBuilder target3.showInterface=false target3.type=ClassTarget -target3.width=90 -target3.x=90 -target3.y=10 -target4.height=120 -target4.name=BinaryTree +target3.width=350 +target3.x=210 +target3.y=320 +target4.height=50 +target4.name=FileSystem target4.showInterface=false target4.type=ClassTarget -target4.width=440 -target4.x=630 -target4.y=30 +target4.width=90 +target4.x=90 +target4.y=10 target5.height=50 -target5.name=ID3 +target5.name=Classification target5.showInterface=false target5.type=ClassTarget -target5.width=80 -target5.x=780 -target5.y=450 -target6.height=50 -target6.name=List +target5.width=110 +target5.x=120 +target5.y=200 +target6.height=120 +target6.name=BinaryTree target6.showInterface=false target6.type=ClassTarget -target6.width=150 -target6.x=840 -target6.y=240 +target6.width=440 +target6.x=640 +target6.y=60 target7.height=50 -target7.name=Passenger +target7.name=ID3 target7.showInterface=false target7.type=ClassTarget -target7.width=90 -target7.x=10 -target7.y=80 +target7.width=80 +target7.x=780 +target7.y=450 target8.height=50 -target8.name=DecisionNode +target8.name=List target8.showInterface=false -target8.type=AbstractTarget -target8.width=80 -target8.x=360 -target8.y=150 -target9.height=250 -target9.name=DecisionTreeBuilder +target8.type=ClassTarget +target8.width=150 +target8.x=840 +target8.y=240 +target9.height=50 +target9.name=DecisionNode target9.showInterface=false -target9.type=ClassTarget -target9.width=350 -target9.x=210 -target9.y=320 +target9.type=AbstractTarget +target9.width=110 +target9.x=360 +target9.y=150