From 38c66cea53f3e55a956b354f8f2e1f8d44bfed9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Felcyn?= Date: Mon, 29 May 2023 12:00:46 +0200 Subject: [PATCH] strip classes --- machine_learning/decisionTree.py | 19 ++----------------- machine_learning/model.pkl | Bin 26921 -> 24689 bytes startup.py | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/machine_learning/decisionTree.py b/machine_learning/decisionTree.py index 40d9965..a2fb6d3 100644 --- a/machine_learning/decisionTree.py +++ b/machine_learning/decisionTree.py @@ -18,10 +18,10 @@ def _read_training_data() -> TrainingData: line_attributes = values[:-1] line_class = values[-1] attributes.append(line_attributes) - classes.append(line_class) + classes.append(line_class.strip()) return TrainingData(attributes, classes) -def attributes_to_floats(attributes: list[str]) -> list[float]: +def _attributes_to_floats(attributes: list[str]) -> list[float]: output: list[float] = [] if attributes[0] == 'Longitiudonal': output.append(0) @@ -88,21 +88,6 @@ trainning_data = _read_training_data() X = trainning_data.attributes Y = trainning_data.classes -# le_shape = LabelEncoder() -# le_flexibility = LabelEncoder() -# le_color = LabelEncoder() - -# le_shape.fit([x[0] for x in X]) -# le_flexibility.fit([x[3] for x in X]) -# le_color.fit([x[4] for x in X]) - -# X_encoded = np.array([ -# [le_shape.transform([x[0]])[0], x[1], x[2], le_flexibility.transform([x[3]])[0], le_color.transform([x[4]])[0]] -# for x in X -# ]) - -# encoder = OneHotEncoder(categories='auto', sparse=False) -# X_encoded = encoder.fit_transform(X_encoded) model = tree.DecisionTreeClassifier() encoded = [_attributes_to_floats(x) for x in X] diff --git a/machine_learning/model.pkl b/machine_learning/model.pkl index 96a720670c84751d261d35286396b88775746e6e..457f45c22ce03cfca5d241654ccc212a301fa627 100644 GIT binary patch delta 3273 zcmaKtc~n%_9mn&AW#(rT-l#AS6y}W*d}^2nMsWzsJP;9`I*w6hPA;LH7x@#Y39tO{SWo*@4u_xilsfQRrSZ?@mM|ntF1tfrye8x z7-{v`;y&qkGR?twS{uKbNZ*<6xqdwZr_&c|6L>E@piP{}$Vk()FXNIoXYR%5q6bSt z!GB$ep1tM$pPi0JWXXxz%@i1?SP-EK zAr6Kz0~ncZ(49h}ZYaYA22~2Fa?9t;NWh$7VsOSV)ygl8?w$u`8dN7_Irc2EX_=^c zw+IcQR&WtUX_cs**p+KjOw>JYk%w~)`jC*d++v$ni;AnL`pOctMnHm7Nzz@SwxZ0i zX`QI`*tIaw=gq`EV-+C4c$EF8Gea3aius1?q5VA+bKwlKq#d#L+;kwg}Xt&UA49!W>UQu6i z)mKCft1v?4)2}Ui=h-XKHlgk?-0bWV{X-m_Ytw#F2i!hfoNG{zkcZsP8AS>Ds*p$6 zcQ$=Z)Wgsg6(G|)9T%rX=<7mzajEDPH`0Sbe&FV>7aP<8{ZS0w6(>FzZOU?GAJ4pC?=sNMH zjOFj8XN3F|WhFM95cLyx{q7Qjo)z+A94$%GbD~blA?T*(h5QT?VZJ59I6A=(fzNr8PK)}b+91@kqvFwLUVk@wn^1S?u5-?aeo5Uip)>!sHa~La?dX*E z&$^|^`MKy9x#qdBtGw9Y+e5)Ku1;r#|ALE=q*q0~g<6i|saI#W z&Mdzioh5W~sB~Tv{ib^lsWbArkTu- zU2N0aqRzXQ==frTej{X*z0yIy74T1B=-?};4e<7CsAsDExv~DH@tAglk&x5@pfOxxw&eaJV z@%XuE**Ml(Dy$KO%S>LC@N|PO8qqz$P81;>;2W zmmTpCujk`;`47?Kyp*+pH>wT9*XkIk9pDd*6 z)O5pRIIit$YJ51f(!{Bi7RLDbPqoRFNuYH@DY~k7`c}>)#+lUU=#2W&c5e_}Q4^_H zo>c0CtESe8bA>wF4TPf(vT7T-s`Jqni*mH8gDPt7L=EA&c#y}*4yjB!SCpc6jfI!n z@+1v4SH0tPc90_=w-OPhma%;H*Pi$fE#n2M8KQO%3< zCIj1j7~5d5<9zP-!e$c<%@!Wu=UB6Yv3nw1Cm(9q0m?DTp{i!rTG)AORBn?lQuVyy z;&@#tyFzu|i}M>zZmSPjo7gd2%fKe{W>N#pQgvl+JmJmCwWhec5d*C{a@lPv(Xs7* z?2hsY<2_YR#`qMfo~4{d_JAMRtx=R$-{_AzA$&Txm>1fDo;w_TqN>yAqn(yo#WdK>|@t;$(Z8t5TAqd z+f=($WjWh*CX#$s!%=P=P}jL&itXS~MC pbGeFak=6~|1+Khnfn|J0wACWp2{Lz>t9|`_JBu>P`tNTK{}0|#XgvS` delta 3680 zcmZuzYj{*w6=jkzxtq|*C4|gPFv(3Jba*&3;W=aibMt^q2!t67kd~56P#f?OsoJPi zQ>e8CZPUU^Ykg%vh1#lVD2ny*VWMq8s}XA3_^2UKv8@jb;t&0ky3e^ge6*E6XVyCB z?z8vW>uhpm(DV2Uo`GjP9xtBt*!hv(LkI8c-O?Lq%)H-I)!Wq6)ELKqJ@pqxTY-b)IQBoVklb{yTGz;eA8@^P)X#vF9ot$ntxxo;seD z>G9l)1KD%tjl~AWUw`k41(l;>o*$;qi^-WAXo0XdA$dcZ z777YtD8Cp5zC2na%sWxx3(;ahOW-Lwi*Rn7!ooD-KyHXC1Xb$n&*xgSRG8KJR>QPt znJ^I?<2)Q@mJ72A7tCVTCXZGKvr<)t@a(@oy%*y} zY3dO4KAfaE=$l(ayM@_2^8s zVeQk83i=e18FSE8QbczM)1_TAP?DgJ3G;ECvt4RoY(|7WA?zo)H6hw3=uQ@Mgt`TN zT4h0Z3ED4?a`QMK?A`3%G~FZUGZ-&R(|v+|qHZjUztn#A`H5F!Q`+gx!R^jLIrSKZ zZVb^OK}WRs<~)l&E6nG(T^)44pu=pp5IrF1Ask*&j1%5G>JjEa*2Rz1`~jW`ae}ZX zH0zXG)GN#v&|V&*hXp;V_3JM$qDO@JJT8=v&=&=L1t%AT=u3jW%(tegPtey;y*xx| zL0{E+9u;&9L*BD`I(=Q3;}{Q&&^H8~!qCDHJuax-4CTsCTmc6@uFn;J#tXN2QS>p@~{*{VJSx)$|u}k?sdIfFESMzi> z>AdV;&;yU(J`y<*dO_GY(2V z`aMoEdPUG5P`09jMg?8e?i&~MM~u(r|DjeU=ug7@S(iV^%q3y|u3ZvdWzk=Rc^%1B zA$nENYdYdz1^w+*MI_fl{}lKyw3{KC5OhTaKTexyle$Ik}ju44^H;z=Ei|UapH^Z9L9@L0A}$uIAN1%<*G5X`rOa)_8Pl zLhpCBMflr7-ZyZO_f|P3ui5aev31PJO%;5OakGh@TO0VdAHIza`f5!~%9*}sA)ai! zNyqhV4D0<=hK-;T&|FVzf@7H|*`e+<(HFJRb2H;cllfVEcP?Z1Y}d{*#wN!r<#W|~ zovJ}`CnV-`F%wN~VLp>Uu(<)wj)0ESUmZZ}Ee7)jM)|kW#arXX4o$!qS&)ecvNnZTQv)&>1tZlGn*RGkDc!i=Yt>)1>?83*Uo;HWN2OV7)Vk(@ z;iU4w+qItRcV9H6YgK2OcJgMn0xx+%!W`E{>$H7C<0(5P*aqm_O zCwNspQF?u-J{zN(-F~00Q~q@Miwy=IT1Qb1r4CnOK|TT9Y5*g zAFFfjn;wov_ztCAHoBQpG5ea`eBHifqdyU0tt|H4TYGDuN8Ur%&H(4@_B*&uyp4ruaAya5o#%nx(<{I4?XG@qKL2m#RBN64Tda(w4$txeEsc`L*Q`>zewFWm&>vnIMZTeEOD?m8icAsW#vviu7IawPdsw%1@*MX(Y?dQ8SZlH z8V=3wSip+D%j7L#5WUO}#+t t+UuR List[Garbage]: for line in lines[1:]: param = line.strip().split(',') garbage_pieces.append( - Garbage('img', param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7])) + Garbage('img', param[0], param[1], param[2], param[3], param[4], param[5], param[6], param[7].strip())) return garbage_pieces