From 31757bbbaede5194447fdab5230ad14bbda8ede9 Mon Sep 17 00:00:00 2001 From: Asecave Date: Sun, 15 Nov 2020 14:26:02 +0100 Subject: [PATCH] Decisiontree done --- DecisionTreeBuilder.java | 13 +++-- package.bluej | 121 ++++++++++++++++++++++----------------- 2 files changed, 75 insertions(+), 59 deletions(-) diff --git a/DecisionTreeBuilder.java b/DecisionTreeBuilder.java index 07f3c7f..06f91e9 100644 --- a/DecisionTreeBuilder.java +++ b/DecisionTreeBuilder.java @@ -28,11 +28,14 @@ public class DecisionTreeBuilder { // ); // usw... // Die Wurzel zuletzt - decisionTree = new BinaryTree<>( - new Decision("vorhersage", "regnerisch"), - feuchtigkeit, - vorhersage - ); + + BinaryTree feuchtigkeit = new BinaryTree<>(new Decision("feuchtigkeit", "hoch"), classNo, classYes); + + BinaryTree wind = new BinaryTree<>(new Decision("wind", "stark"), classNo, classYes); + + BinaryTree vorhersage = new BinaryTree<>(new Decision("vorhersage", "regnerisch"), wind, classYes); + + decisionTree = new BinaryTree<>(new Decision("vorhersage", "sonnig"), feuchtigkeit, vorhersage); } /** diff --git a/package.bluej b/package.bluej index 460a419..688dc0e 100644 --- a/package.bluej +++ b/package.bluej @@ -1,44 +1,50 @@ #BlueJ package file -dependency1.from=DecisionNode -dependency1.to=Dataset +dependency1.from=DecisionTreeBuilder +dependency1.to=BinaryTree dependency1.type=UsesDependency -dependency2.from=Classification -dependency2.to=Dataset +dependency10.from=Decision +dependency10.to=Dataset +dependency10.type=UsesDependency +dependency2.from=DecisionTreeBuilder +dependency2.to=DecisionNode dependency2.type=UsesDependency -dependency3.from=Decision -dependency3.to=Dataset +dependency3.from=DecisionTreeBuilder +dependency3.to=Classification dependency3.type=UsesDependency dependency4.from=DecisionTreeBuilder -dependency4.to=BinaryTree +dependency4.to=Decision dependency4.type=UsesDependency dependency5.from=DecisionTreeBuilder -dependency5.to=DecisionNode +dependency5.to=Dataset dependency5.type=UsesDependency -dependency6.from=DecisionTreeBuilder -dependency6.to=Classification +dependency6.from=Classification +dependency6.to=Dataset dependency6.type=UsesDependency -dependency7.from=DecisionTreeBuilder -dependency7.to=Decision +dependency7.from=DecisionTreeTest +dependency7.to=DecisionTreeBuilder dependency7.type=UsesDependency -dependency8.from=DecisionTreeBuilder +dependency8.from=DecisionTreeTest dependency8.to=Dataset dependency8.type=UsesDependency -editor.fx.0.height=722 -editor.fx.0.width=800 -editor.fx.0.x=388 -editor.fx.0.y=50 -objectbench.height=66 +dependency9.from=DecisionNode +dependency9.to=Dataset +dependency9.type=UsesDependency +editor.fx.0.height=0 +editor.fx.0.width=0 +editor.fx.0.x=0 +editor.fx.0.y=0 +objectbench.height=96 objectbench.width=1201 package.divider.horizontal=0.6 -package.divider.vertical=0.8983286908077994 -package.editor.height=622 -package.editor.width=1078 +package.divider.vertical=0.8476331360946746 +package.editor.height=553 +package.editor.width=1090 package.editor.x=39 package.editor.y=24 package.frame.height=776 package.frame.width=1241 -package.numDependencies=8 -package.numTargets=6 +package.numDependencies=10 +package.numTargets=7 package.showExtends=true package.showUses=true project.charset=UTF-8 @@ -47,45 +53,52 @@ readme.name=@README readme.width=47 readme.x=10 readme.y=10 -target1.height=40 -target1.name=Classification +target1.height=60 +target1.name=DecisionTreeBuilder target1.showInterface=false target1.type=ClassTarget -target1.width=210 -target1.x=40 -target1.y=460 -target2.height=50 -target2.name=Decision +target1.width=270 +target1.x=580 +target1.y=230 +target2.height=40 +target2.name=Dataset target2.showInterface=false target2.type=ClassTarget -target2.width=190 -target2.x=300 -target2.y=460 -target3.height=120 -target3.name=BinaryTree +target2.width=270 +target2.x=430 +target2.y=30 +target3.height=40 +target3.name=Classification target3.showInterface=false target3.type=ClassTarget -target3.width=440 -target3.x=890 -target3.y=250 -target4.height=40 -target4.name=Dataset +target3.width=210 +target3.x=40 +target3.y=460 +target4.height=120 +target4.name=BinaryTree target4.showInterface=false target4.type=ClassTarget -target4.width=270 -target4.x=430 -target4.y=30 +target4.width=440 +target4.x=890 +target4.y=250 target5.height=50 -target5.name=DecisionNode +target5.name=DecisionTreeTest target5.showInterface=false -target5.type=AbstractTarget -target5.width=110 -target5.x=210 -target5.y=290 -target6.height=60 -target6.name=DecisionTreeBuilder +target5.type=ClassTarget +target5.width=130 +target5.x=70 +target5.y=10 +target6.height=50 +target6.name=DecisionNode target6.showInterface=false -target6.type=ClassTarget -target6.width=270 -target6.x=580 -target6.y=230 +target6.type=AbstractTarget +target6.width=110 +target6.x=210 +target6.y=290 +target7.height=50 +target7.name=Decision +target7.showInterface=false +target7.type=ClassTarget +target7.width=190 +target7.x=300 +target7.y=460