diff --git a/createDecisionTree.py b/createDecisionTree.py index 0cfddd3..537c75b 100644 --- a/createDecisionTree.py +++ b/createDecisionTree.py @@ -4,6 +4,7 @@ import pydotplus from sklearn.tree import DecisionTreeClassifier import matplotlib.pyplot as plt import matplotlib.image as pltimg +import joblib df = pandas.read_csv("treedata\\data.csv") @@ -38,12 +39,14 @@ y = df['Decision'] dtree = DecisionTreeClassifier() dtree = dtree.fit(X, y) +joblib.dump(dtree, 'treedata\\DecisionTree.pkl') + data = tree.export_graphviz(dtree, out_file=None, feature_names=features) graph = pydotplus.graph_from_dot_data(data) -graph.write_png('mydecisiontree.png') +graph.write_png('treedata\\mydecisiontree.png') -img = pltimg.imread('mydecisiontree.png') +img = pltimg.imread('treedata\\mydecisiontree.png') imgplot = plt.imshow(img) plt.show() diff --git a/Testfile.py b/createTreeData.py similarity index 99% rename from Testfile.py rename to createTreeData.py index bc9ed54..4b7d4a5 100644 --- a/Testfile.py +++ b/createTreeData.py @@ -119,4 +119,4 @@ filename = "treedata\\data.csv" with open(filename, 'w') as csvfile: writer = csv.DictWriter(csvfile, fieldnames=fields) writer.writeheader() - writer.writerows(dict) + writer.writerows(dict) \ No newline at end of file diff --git a/main.py b/main.py index bb67d7d..5125206 100644 --- a/main.py +++ b/main.py @@ -7,11 +7,11 @@ import WeatherConditions import convertToPrediction import drawUI import Graphsearch as graph -from decisiontree import dtree from Tractor import Tractor from TractorLoad import TillageUnit from constants import * from manualSteering import manualSteeringDriver +import joblib pygame.init() @@ -58,6 +58,9 @@ while working: weather, day_time, temperature, wind, humidy = WeatherConditions.checkConditions() question = [convertToPrediction.convert(field.state, weather, day_time, temperature, wind, humidy)] + + dtree = joblib.load('treedata\\DecisionTree.pkl') + decision = dtree.predict(question) if tractor.autodrive: diff --git a/treedata/DecisionTree.pkl b/treedata/DecisionTree.pkl new file mode 100644 index 0000000..c48082d Binary files /dev/null and b/treedata/DecisionTree.pkl differ diff --git a/mydecisiontree.png b/treedata/mydecisiontree.png similarity index 100% rename from mydecisiontree.png rename to treedata/mydecisiontree.png