From b8b3769a2fbca58032ecebd5e33daf7f419ada3c Mon Sep 17 00:00:00 2001 From: ilysko Date: Thu, 7 Sep 2017 15:57:30 +0300 Subject: [PATCH 01/40] Same lecture02 example for Netbeans --- build.xml | 73 + build/classes/.netbeans_automatic_build | 0 build/classes/.netbeans_update_resources | 0 .../lectures/lecture02/BoxingExample.class | Bin 0 -> 1298 bytes .../lecture02/BreakAndContinueExample.class | Bin 0 -> 1211 bytes .../lecture02/CalculatorExample.class | Bin 0 -> 1100 bytes .../lectures/lecture02/CommentsExample.class | Bin 0 -> 623 bytes .../ConstructorExample$Rectangular.class | Bin 0 -> 603 bytes .../lecture02/ConstructorExample.class | Bin 0 -> 562 bytes .../lecture02/ForAndForEachExample.class | Bin 0 -> 1055 bytes .../IfElseAndSwitchCaseExample.class | Bin 0 -> 883 bytes .../caf82/lectures/lecture02/LinkTypes.class | Bin 0 -> 1578 bytes .../lectures/lecture02/OperatorsExample.class | Bin 0 -> 3404 bytes .../lectures/lecture02/PrimitiveTypes.class | Bin 0 -> 1166 bytes .../lectures/lecture02/StringProcessing.class | Bin 0 -> 1627 bytes .../lecture02/WhileAndDoWhileExample.class | Bin 0 -> 941 bytes manifest.mf | 3 + nbproject/build-impl.xml | 1420 +++++++++++++++++ nbproject/genfiles.properties | 8 + nbproject/private/private.properties | 2 + nbproject/private/private.xml | 4 + nbproject/project.properties | 74 + nbproject/project.xml | 15 + .../lectures/lecture02/BoxingExample.java | 26 + .../lecture02/BreakAndContinueExample.java | 44 + .../lectures/lecture02/CalculatorExample.java | 35 + .../lectures/lecture02/CommentsExample.java | 18 + .../lecture02/ConstructorExample.java | 15 + .../lecture02/ForAndForEachExample.java | 17 + .../lecture02/IfElseAndSwitchCaseExample.java | 32 + .../caf82/lectures/lecture02/LinkTypes.java | 32 + .../lectures/lecture02/OperatorsExample.java | 58 + .../lectures/lecture02/PrimitiveTypes.java | 43 + .../lectures/lecture02/StringProcessing.java | 39 + .../lecture02/WhileAndDoWhileExample.java | 20 + 35 files changed, 1978 insertions(+) create mode 100644 build.xml create mode 100644 build/classes/.netbeans_automatic_build create mode 100644 build/classes/.netbeans_update_resources create mode 100644 build/classes/ru/caf82/lectures/lecture02/BoxingExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/BreakAndContinueExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/CalculatorExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/CommentsExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/ConstructorExample$Rectangular.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/ConstructorExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/ForAndForEachExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/LinkTypes.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/OperatorsExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/PrimitiveTypes.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/StringProcessing.class create mode 100644 build/classes/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.class create mode 100644 manifest.mf create mode 100644 nbproject/build-impl.xml create mode 100644 nbproject/genfiles.properties create mode 100644 nbproject/private/private.properties create mode 100644 nbproject/private/private.xml create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml create mode 100644 src/ru/caf82/lectures/lecture02/BoxingExample.java create mode 100644 src/ru/caf82/lectures/lecture02/BreakAndContinueExample.java create mode 100644 src/ru/caf82/lectures/lecture02/CalculatorExample.java create mode 100644 src/ru/caf82/lectures/lecture02/CommentsExample.java create mode 100644 src/ru/caf82/lectures/lecture02/ConstructorExample.java create mode 100644 src/ru/caf82/lectures/lecture02/ForAndForEachExample.java create mode 100644 src/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.java create mode 100644 src/ru/caf82/lectures/lecture02/LinkTypes.java create mode 100644 src/ru/caf82/lectures/lecture02/OperatorsExample.java create mode 100644 src/ru/caf82/lectures/lecture02/PrimitiveTypes.java create mode 100644 src/ru/caf82/lectures/lecture02/StringProcessing.java create mode 100644 src/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.java diff --git a/build.xml b/build.xml new file mode 100644 index 0000000..7fb9177 --- /dev/null +++ b/build.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + Builds, tests, and runs the project TextClassifierProject. + + + diff --git a/build/classes/.netbeans_automatic_build b/build/classes/.netbeans_automatic_build new file mode 100644 index 0000000..e69de29 diff --git a/build/classes/.netbeans_update_resources b/build/classes/.netbeans_update_resources new file mode 100644 index 0000000..e69de29 diff --git a/build/classes/ru/caf82/lectures/lecture02/BoxingExample.class b/build/classes/ru/caf82/lectures/lecture02/BoxingExample.class new file mode 100644 index 0000000000000000000000000000000000000000..dd79ebc6b44eb593d18efcf99216083575969db5 GIT binary patch literal 1298 zcma)6O-~b16g{sqo!6EkP@sw*Ao$e+Ww4?W@gu>Akd#7FLI`dg>QDx!Ee=yae}h{W z#+4gbxzGg~7ybZ$i9f=KXQmZeJ`7Fs-o5AEd)_yu|z6iQ;C5)@M z7C{fLd+Ci35?+#&=$9A}(C%9$%Y7)IB$D$2>f`bYQ=lbdmCS6VxMVtW#*$4WmMP~A zd){y?FRy{ByJD>i3}l>&o;Q|9)4FZu-HKzb{|koG`gnQEDixk=8O1f*9ODs1!zu~H z6VEcM#)hHWMya6ZT!&3#{uK8tT$k(8!RlQqpj_=AB^kDb>WH_i&o|s$$rDy3R!1 z3DwJvB^M9j`!9}Og!pUqJ^}Cr(8M*$Oy@4R2m8N5eD=%DTs0q5aE5WT+JF|cG7F;( zF(Momzo9@9+i6XILm=a?)Bc+M0%ahz4XN%xRd%6z`QV{EwTs}t(ta4zb|Kr8UnIPz z*7jg+*T~YPc4>_~M1n^UvedY}ay9YfDe&Zt`%*N@loS%8pa}ZtNt)RMc1%+2EQKzx z@*M40K_}iIj<-0A_c(`bbotgyR^_v!gRB}pvM=tN^MRdldL6?%_Q!ed0%kZBhf2n$ zIL|0Z-bc8=NW(?We?n-Fe;=yEC5i6p7eb=Sc!X(4Ue{jJN+i!e*d5uUsU|M{%;pi2*Bg-X6Tb(V# z(ryq{4iTpF3eg$j)v9imXyWuj<`AQeNhmItKIF_F7aw-4`lT?mrVj^F#e|3cARvZd zRlp;>NA;uYl{|mhq^BFDH!MCM=^9hY&mE^dCs9E+T%_=r z2!4VdJVP&@qYp39k5}{$ct^gE6tjZ?kIPX6=>l@-L>F;5j=_fX05epri+mOe4IA+a q6-mN$idHY8d+@R7F1q(1vF6TQ1oseOLP>;oks_T+c2lSir+)*Ygc1Az literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/CalculatorExample.class b/build/classes/ru/caf82/lectures/lecture02/CalculatorExample.class new file mode 100644 index 0000000000000000000000000000000000000000..cba620985334d41b688a5d85e530e11a5f1b5ef1 GIT binary patch literal 1100 zcmb7D*>2N76g`v0PF#0ONJ{Bmwj`x>DWOy<>PtnXN)aFhRa88nNos;CC#f78wLj3W zK}eu35=eXiAB8w$8xo*AAZupsGCud5d+l%EKYs;K#fE_)+{z+_+iJU`3DoSr(Ak(t_deG?k0?AUD47D)O4&5EzZcC>lP%OQw9m;poa%HDw)qT(D zv^GQT(rb}T{)#kTCi|v{GZc z+w5gNMEX4}pdYDAF8h@#?UeVhz>i>vUrmA!m4z0?@zl7;7y{$8_L)zrNaYfuGIfqb zW%?Y+j|?S{aC6)j2PDriGEX>zqgmimk{3ftH-7-&{jEm; literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/CommentsExample.class b/build/classes/ru/caf82/lectures/lecture02/CommentsExample.class new file mode 100644 index 0000000000000000000000000000000000000000..6b318099591f63f3ffbcf58b4d148f3fcc8ff462 GIT binary patch literal 623 zcmb7BT`vPc6g|^cw_QcG>ic7PQG^wdkPt7zgKUsgym*?fQB%7+&F-x5vv?r!;0O3o z;_kNMBVNqIy>rjK_sl(a-riqc0c>KyL>?nW)G%7Wn2B*r7??CL#gN~Xfz*2p+4|Bs zLvCMP3Wgy^2I4sOn<6~pO^=X@qg?Kt^H3&n56tOn88NInVQjnnYJ0=>gsbCFM4y-S z4SQetz6f-5aL4_QCwAx&pUZ$@w0_~V`7O6S9<=O+4rS2VNr&KJi)gEVq#4YHibGc% z%4DjMU*u~EUkL^Z2Bu4x!7Rh9BlKcqc}m?_T3K#y97_h)5mg(QE5X7%!^%HYFqFSW zKWVl}_7A9WA8Fy!R#i-iT34r3_9=h!Cn@r1L$&%}3&K45=s%N_ z0hOabwn&jpo{{fceg=C;(;km6t{={K*=!6 zwM>75UOyNmahmBo%o2U_B<2rF9&_&?ilb~u*l!nY-klKaQF0>*wQ&^7^L##)`dUmC zXX@i56lx-LWbjYYHbM#2OBN^MyIcuP@Xq2`>X8y@D*16xP)6$y8PDThCAkjeX=Fq+ z|Bu|AiAUjK31trsnhv%IN5!`G_eX+n2m{6A1Q*j84@M}p&1$;ESh2%*wfV&4`$nFL z*c>dguP_?IVguaH-V3Pn3hSAX1($u9YrtJq_Koi%<0D FKwlXko%a9$ literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/ConstructorExample.class b/build/classes/ru/caf82/lectures/lecture02/ConstructorExample.class new file mode 100644 index 0000000000000000000000000000000000000000..29425b95b7792019b4de53c72b1e5a80abe3d3ee GIT binary patch literal 562 zcmb7BO-lnY5Pj3HwcBd7)z+)vp(=Ds@gP>b6a`^Xu+odCbd5D-o0aUY__sU>9{d6R zC~>kX7V4#e%w*o=y}TqJpKtE~4zcYbk4*<#4w?>HgvzxH5}_w)C=8)`p|v!FP{gr} z38fRIRdPzmxA#Vb!XUbngqp9kyi8|fX>PBQk4`C*( z-1w(WaEDQ90(q{ivDTt~$4XY=V1>|G&KhC;&(GC(%GV(rFQ>6P_ukk+j=#f>9LQSY zSmw&(Oq`4Rub`K#?Q$$-U>+4-SHCxKUgfHcHPjff7$dGzAO>hmoXqTf&fe?nv-aBa_4lV^01xmeiWo*aFotmx6H$aQ z8o?dqCzZLYOe%^rrj(gBkufnNU@SYXvMoJF?azXmzwa~zvNt=GIKZkcvXmiE`)$ZEY} zFY%_TbX5XVzj^eP;4 zyd9x!jN%&qTJ?m$@u7>hn>&kM(Cbr25Fc9U9$KRnG;p2k*eL+L=;N*f{fINd!-5kc z5(u>AMC1@-9})VDaPbIQuik`_Xu@nF(nQBQA>N;SXS#`~`6XHmYx$z4=Zm_LFB)b( zH@%rTUI{N~ac$%f=}cUkUC=KTi?iZ+HI3E2DY9WGvXdkQL}1b<=_lE1hO}4N=N3D4 z>3t$qGgG7-!UP5|$R@UMv$fKh32*~L^sAU>G{NjJcekMZLP-3?_z5-CO^leh#h1O~ M2d0U-O;iZUKRWg7w*UYD literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.class b/build/classes/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.class new file mode 100644 index 0000000000000000000000000000000000000000..ff3a1929b6a0d91cd56fc57899129ec559360c53 GIT binary patch literal 883 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 literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/StringProcessing.class b/build/classes/ru/caf82/lectures/lecture02/StringProcessing.class new file mode 100644 index 0000000000000000000000000000000000000000..7585d1c9381e5b61ea0075dcc22d25afd47747aa GIT binary patch literal 1627 zcmb7E-E$LF6#w0P?Ka)okhYW-l=z*}w1J3-Ev=9$5(%MNELQy5q_@pNnq+o2FnyFa zWn_jKp2YFR8DI3Fb%w1&wY>9m_aAaRCmW!Wj-$!UIp?19JKraH^w)zO0LLNYIE0*r zH*_42BZN15Z~|{>I2lI_IUR2^pJK~2OQ)F3#4(F^bev}O876rhbIfOSysP6q7SA$y zpUF8L1?C?xIj^Cp;etTylvTIfS%GkRY*8RG*I1SU{Y9%TORcrCv@e;`Ov?Y-zo|A@IhA79pHk`pm!>x8*^?r}hI;7V;ySx9RRKp8RAqTV9v8Lzh3gN3$ImUc^EAlj2VZf`1D{57R44 zTo8{Q*@D_p9=w8ANkh(}gfJliZyTYdWOxga;%|sTwv>eVjGVn8Xgk6Ao~JHl33uL9Jr7iENLeqoGmf9g`uhF zNHpVN|4_uk@B|5$$$up3ft>or!^s04Mp#8vv^5?^cRinWn@57W&=IHaYv@HDeJG$G z68lg^64x+*ItHyD~?~0#u&}2iV}`s hoJM~Q=aC^PO!3ZP0+WbP)EQdC7@~wcN`4_6`x}mUqt5^U literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.class b/build/classes/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.class new file mode 100644 index 0000000000000000000000000000000000000000..d5a3e548679addaf23a8064fbae4021c199ad1d0 GIT binary patch literal 941 zcmb7CTWb?R6#gbjca!b5jY-q0+f?gyTWzQ zD5h~%>2pe)SK@+7U({jiSZ2^Rr6{ z-8v7X@<+i`xGQ@MGcZa24#QL} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set src.dir + Must set test.src.dir + Must set build.dir + Must set dist.dir + Must set build.classes.dir + Must set dist.javadoc.dir + Must set build.test.classes.dir + Must set build.test.results.dir + Must set build.classes.excludes + Must set dist.jar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must set JVM to use for profiling in profiler.info.jvm + Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + Must select one file in the IDE or set run.class + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set debug.class + + + + + Must select one file in the IDE or set debug.class + + + + + Must set fix.includes + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + This target only works when run from inside the NetBeans IDE. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Must select some files in the IDE or set javac.includes + + + + + + + + + + + + + + + + + + + + Some tests failed; see details above. + + + + + + + + + Must select some files in the IDE or set test.includes + + + + Some tests failed; see details above. + + + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + + + + Must select one file in the IDE or set test.class + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + + + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + Must select one file in the IDE or set applet.url + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties new file mode 100644 index 0000000..8e99bbf --- /dev/null +++ b/nbproject/genfiles.properties @@ -0,0 +1,8 @@ +build.xml.data.CRC32=0fd20a72 +build.xml.script.CRC32=687418d1 +build.xml.stylesheet.CRC32=8064a381@1.80.1.48 +# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. +# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. +nbproject/build-impl.xml.data.CRC32=0fd20a72 +nbproject/build-impl.xml.script.CRC32=fbbe4592 +nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48 diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties new file mode 100644 index 0000000..95dd346 --- /dev/null +++ b/nbproject/private/private.properties @@ -0,0 +1,2 @@ +compile.on.save=true +user.properties.file=/home/ilysko/.netbeans/8.2/build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml new file mode 100644 index 0000000..4750962 --- /dev/null +++ b/nbproject/private/private.xml @@ -0,0 +1,4 @@ + + + + diff --git a/nbproject/project.properties b/nbproject/project.properties new file mode 100644 index 0000000..8de8683 --- /dev/null +++ b/nbproject/project.properties @@ -0,0 +1,74 @@ +annotation.processing.enabled=true +annotation.processing.enabled.in.editor=false +annotation.processing.processor.options= +annotation.processing.processors.list= +annotation.processing.run.all.processors=true +annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output +build.classes.dir=${build.dir}/classes +build.classes.excludes=**/*.java,**/*.form +# This directory is removed when the project is cleaned: +build.dir=build +build.generated.dir=${build.dir}/generated +build.generated.sources.dir=${build.dir}/generated-sources +# Only compile against the classpath explicitly listed here: +build.sysclasspath=ignore +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +# Uncomment to specify the preferred debugger connection transport: +#debug.transport=dt_socket +debug.classpath=\ + ${run.classpath} +debug.test.classpath=\ + ${run.test.classpath} +# Files in build.classes.dir which should be excluded from distribution jar +dist.archive.excludes= +# This directory is removed when the project is cleaned: +dist.dir=dist +dist.jar=${dist.dir}/TextClassifierProject.jar +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +includes=** +jar.compress=false +javac.classpath= +# Space-separated list of extra javac options +javac.compilerargs= +javac.deprecation=false +javac.external.vm=true +javac.processorpath=\ + ${javac.classpath} +javac.source=1.8 +javac.target=1.8 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +javac.test.processorpath=\ + ${javac.test.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +main.class= +manifest.file=manifest.mf +meta.inf.dir=${src.dir}/META-INF +mkdist.disabled=false +platform.active=default_platform +run.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir} +# Space-separated list of JVM arguments used when running the project. +# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value. +# To set system properties for unit tests define test-sys-prop.name=value: +run.jvmargs= +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +source.encoding=UTF-8 +src.dir=src +test.src.dir=test diff --git a/nbproject/project.xml b/nbproject/project.xml new file mode 100644 index 0000000..764375f --- /dev/null +++ b/nbproject/project.xml @@ -0,0 +1,15 @@ + + + org.netbeans.modules.java.j2seproject + + + TextClassifierProject + + + + + + + + + diff --git a/src/ru/caf82/lectures/lecture02/BoxingExample.java b/src/ru/caf82/lectures/lecture02/BoxingExample.java new file mode 100644 index 0000000..1f64c70 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/BoxingExample.java @@ -0,0 +1,26 @@ +package ru.caf82.lectures.lecture02; + +public class BoxingExample { + + public static void main(String[] args) { + Integer i = Integer.valueOf(50); + Integer iTwo = Integer.valueOf(50); + Integer iThree = 50; + + System.out.println(i == iThree); + System.out.println(i == iTwo); + System.out.println(i.equals(iThree)); + System.out.println(i.equals(iTwo)); + + System.out.println("----------------------------------------"); + + Integer iNew = Integer.valueOf(1000); + Integer iNewTwo = Integer.valueOf(1000); + Integer iNewThree = 1000; + + System.out.println(iNew == iNewThree); + System.out.println(iNew == iNewTwo); + System.out.println(iNew.equals(iNewThree)); + System.out.println(iNew.equals(iNewTwo)); + } +} diff --git a/src/ru/caf82/lectures/lecture02/BreakAndContinueExample.java b/src/ru/caf82/lectures/lecture02/BreakAndContinueExample.java new file mode 100644 index 0000000..ad6005e --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/BreakAndContinueExample.java @@ -0,0 +1,44 @@ +package ru.caf82.lectures.lecture02; + +/** + * Created by ilysko on 24.08.17. + */ +public class BreakAndContinueExample { + public static void main(String[] args) { + // Break example + for (int i = 0; i < 100; i++) { + if (i == 4) { + break; + } + System.out.print(i + " "); + } + + System.out.println(); + + // Continue example + for (int i = 0; i < 10; i++) { + if (i % 2 == 0) { + continue; + } + System.out.print(i + " "); + } + + System.out.println("\n"); + + // Continue and Break with "tags" + outer: + for (int i = 0; i < 10; i++) { + inner: + for (int j = 0; j < 10; j++) { + if (j > i) { + System.out.println(); + continue outer; + } + if (i == 8) { + break outer; + } + System.out.print(" " + (i * j)); + } + } + } +} diff --git a/src/ru/caf82/lectures/lecture02/CalculatorExample.java b/src/ru/caf82/lectures/lecture02/CalculatorExample.java new file mode 100644 index 0000000..edfa955 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/CalculatorExample.java @@ -0,0 +1,35 @@ +package ru.caf82.lectures.lecture02; + +public class CalculatorExample { + private int x; + private int y; + + CalculatorExample(int x, int y) { + this.x = x; + this.y = y; + } + + public void setX(int x) { + this.x = x; + } + + public void setY(int y) { + this.y = y; + } + + public int getSubst() { + return x-y; + } + + public float getSum() { + return (float) x + y; + } + + public static void main(String[] args) { + CalculatorExample calc = new CalculatorExample(5, 2); + System.out.println(calc.getSum()); + System.out.println(calc.getSubst()); + + //todo create new calculator, add abs function from Math + } +} diff --git a/src/ru/caf82/lectures/lecture02/CommentsExample.java b/src/ru/caf82/lectures/lecture02/CommentsExample.java new file mode 100644 index 0000000..7923149 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/CommentsExample.java @@ -0,0 +1,18 @@ +package ru.caf82.lectures.lecture02; + +/** + * @author ilysko + * @version 1.0 + * Class for comment representation + */ +public class CommentsExample { + public static void main(String[] args) { + System.out.println("Let's look to comments in Java"); + /* + * Realy big + * comment + */ + + //System.out.println("Cool!"); + } +} diff --git a/src/ru/caf82/lectures/lecture02/ConstructorExample.java b/src/ru/caf82/lectures/lecture02/ConstructorExample.java new file mode 100644 index 0000000..81727c9 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/ConstructorExample.java @@ -0,0 +1,15 @@ +package ru.caf82.lectures.lecture02; + +public class ConstructorExample { + + public class Rectangular { + + //todo create fields weight and length, create constructor, create method Square + + } + + + public static void main(String[] args) { + //todo write some test + } +} diff --git a/src/ru/caf82/lectures/lecture02/ForAndForEachExample.java b/src/ru/caf82/lectures/lecture02/ForAndForEachExample.java new file mode 100644 index 0000000..31e25d5 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/ForAndForEachExample.java @@ -0,0 +1,17 @@ +package ru.caf82.lectures.lecture02; + +/** + * Created by ilysko on 24.08.17. + */ +public class ForAndForEachExample { + public static void main(String[] args) { + for (int i = 1; i < 5; i++) { + System.out.println("i = " + i); + } + System.out.println(); + int[] intList = {1,2,3,4}; + for (int i : intList) { + System.out.println("i = " + i); + } + } +} diff --git a/src/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.java b/src/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.java new file mode 100644 index 0000000..22f0f4a --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.java @@ -0,0 +1,32 @@ +package ru.caf82.lectures.lecture02; + +/** + * Created by ilysko on 24.08.17. + */ +public class IfElseAndSwitchCaseExample { + public static void main(String[] args) { + int myMark = 5; + + if (myMark == 5) { + System.out.println("Excellent"); + } else if (myMark <= 4 && myMark >=3) { + System.out.println("Not bad"); + } else { + System.out.println("Bad"); + } + + switch (myMark) { + case 5: + System.out.println("Excellent"); + break; + case 4: + System.out.println("Good"); + break; + case 2: + System.out.println("Bad"); + default: + System.out.println("Not bad"); + break; + } + } +} diff --git a/src/ru/caf82/lectures/lecture02/LinkTypes.java b/src/ru/caf82/lectures/lecture02/LinkTypes.java new file mode 100644 index 0000000..d3c581c --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/LinkTypes.java @@ -0,0 +1,32 @@ +package ru.caf82.lectures.lecture02; + +public class LinkTypes { + + public static void main(String[] args) { + String a = "Hello", b = "World"; + + System.out.println(a + " " + b); + + String c = 2 + 2 + ""; + String d = "" + 2 + 2; + String g = "" + (2 + 2); + + System.out.println(c); + System.out.println(d); + System.out.println(g); + + String foo = "a string"; + String bar = "a string"; + String baz = new String("a string"); + + System.out.println("foo == bar ? " + (foo == bar)); + System.out.println("foo равен bar ? " + (foo.equals(bar))); + System.out.println("foo == baz ? " + (foo == baz)); + System.out.println("foo равен baz ? " + (foo.equals(baz))); + + + + } + + +} diff --git a/src/ru/caf82/lectures/lecture02/OperatorsExample.java b/src/ru/caf82/lectures/lecture02/OperatorsExample.java new file mode 100644 index 0000000..6bcc959 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/OperatorsExample.java @@ -0,0 +1,58 @@ +package ru.caf82.lectures.lecture02; + +import com.sun.org.apache.xpath.internal.SourceTree; + +/** + * Created by ilysko on 24.08.17. + */ +public class OperatorsExample { + public static void main(String[] args) { + System.out.println("Arithmetical operators:"); + int a = 10, b = 3, c = 2; + float g = 5.14f, f = 2.05f; + System.out.println("a + c - b = " + (a + c - b)); + System.out.println("b * c = " + b * c); + System.out.println("a / b = " + a / b); // pay attention for this (integer division) + System.out.println("g / f = " + g / f); + + System.out.println("\nUnary operators:"); + int d = 4; + boolean e = true; + System.out.println("d++ = " + d++); + System.out.println("d = " + d); + System.out.println("++d = " + ++d); + System.out.println("(byte) d = " + Integer.toBinaryString(d)); + System.out.println("(byte) ~d = " + Integer.toBinaryString(~d)); + System.out.println("!e = " + !e); + + System.out.println("\nRelational operators:"); + double p = 5.5d, r = 2.7500000000000001d; + System.out.println("p / 2 == r = " + (p / 2 == r)); + + System.out.println("\nBitwise operators:"); + // TODO разобраться с битовыми представлениями! + byte t = 0b1110, q = 0b0111; + byte y = -13; + System.out.println("t & q = " + Integer.toBinaryString(t & q)); + System.out.println("t | q = " + Integer.toBinaryString(t | q)); + System.out.println("t ^ q = " + Integer.toBinaryString(t ^ q)); + System.out.println("y = " + String.format("%8s", Integer.toBinaryString(y & 0xFF)).replace(' ', '0')); + System.out.println("-y = " + String.format("%8s", Integer.toBinaryString(-y & 0xFF)).replace(' ', '0')); + System.out.println("y << 2 = " + (y << 2)); + System.out.println("y >> 2 = " + (y >> 2)); + System.out.println("y >>> 2 = " + (y >>> 2)); + System.out.println("y << 2 = " + Integer.toBinaryString(y << 2)); + System.out.println("y >> 2 = " + Integer.toBinaryString(y >> 2)); + System.out.println("y >>> 2 = " + Integer.toBinaryString(y >>> 2)); + + System.out.println("\nLogical operators:"); + boolean b1 = false, b2 = true; + System.out.println("b1 || b2 = " + (b1 || b2)); + System.out.println("b1 && b2 = " + (b1 && b2)); + + System.out.println("\nTernary operators:"); + boolean b3 = true; + System.out.println("Rolling " + (b3 ? "Stones" : "Trees")); + System.out.println("Paint It " + (!b3 ? "Red" : "Black")); + } +} diff --git a/src/ru/caf82/lectures/lecture02/PrimitiveTypes.java b/src/ru/caf82/lectures/lecture02/PrimitiveTypes.java new file mode 100644 index 0000000..a5dcc37 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/PrimitiveTypes.java @@ -0,0 +1,43 @@ +package ru.caf82.lectures.lecture02; + +public class PrimitiveTypes { + + + public static void main(String[] args) { + + //byte b = 216; + short s = 1123; + int i = 64536; + long l = 2147483648L; + int j = 10; + + System.out.println(i); + //System.out.println(b); + System.out.println(s); + System.out.println(l); + + System.out.println(i + 2147483647); + System.out.println(l + j); + System.out.println(j + l); + + char a = 'a', c = 'c'; + int b; + b = ((a + c) / 2); + System.out.println(b); + System.out.println((char) b); + + System.out.println((char) b + i); + System.out.println(b+i); + + double doubleOne, doubleTwo = 4.12; + doubleOne = 22.1 + doubleTwo; + float pi = 3.14f; + //float anotherPi = 3.14; + double doubleThree = 27; + double d = pi * doubleThree; + + System.out.println(d); + System.out.println(doubleOne); + System.out.println(pi); + } +} diff --git a/src/ru/caf82/lectures/lecture02/StringProcessing.java b/src/ru/caf82/lectures/lecture02/StringProcessing.java new file mode 100644 index 0000000..b51d9b5 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/StringProcessing.java @@ -0,0 +1,39 @@ +package ru.caf82.lectures.lecture02; + +public class StringProcessing { + + public static void main(String[] args) { + + //String Buffer examples + StringBuffer sb = new StringBuffer("Котэ"); + + System.out.println("Длина: " + sb.length()); + System.out.println("Объем: " + sb.capacity()); + + sb.setCharAt(1, 'o'); + + System.out.println("Было Котэ, стало: " + sb.toString()); + + String str1 = "У кота "; + String str2 = " лапы"; + int paws = 4; + StringBuffer sbNew = new StringBuffer(20); + sbNew.append(str1).append(paws).append(str2); + + System.out.println(sbNew.toString()); + + sb.insert(0, "Люблю "); + System.out.println(sb.toString()); + + sb.reverse(); + System.out.println(sb.toString()); + + //TODO delete, deleteCharAt, replace, substring write your own code + + + + //TODO StringBuilder the same methods implementation + + } + +} diff --git a/src/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.java b/src/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.java new file mode 100644 index 0000000..d3fbb84 --- /dev/null +++ b/src/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.java @@ -0,0 +1,20 @@ +package ru.caf82.lectures.lecture02; + +/** + * Created by ilysko on 24.08.17. + */ +public class WhileAndDoWhileExample { + public static void main(String[] args) { + int i = 3; + + while (i > 0) { + System.out.println(i--); + } + + System.out.println("\n" + i + "\n"); + + do { + System.out.println(i--); + } while (i > 0); + } +} From 09c98f399b91dd983441f4aa8ff39d5eee91ab3c Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Sun, 17 Sep 2017 14:49:17 +0300 Subject: [PATCH 02/40] add new classes --- .idea/vcs.xml | 2 +- nbproject/private/private.properties | 2 +- nbproject/private/private.xml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties index 95dd346..8acf1dc 100644 --- a/nbproject/private/private.properties +++ b/nbproject/private/private.properties @@ -1,2 +1,2 @@ compile.on.save=true -user.properties.file=/home/ilysko/.netbeans/8.2/build.properties +user.properties.file=C:\\Users\\1\\AppData\\Roaming\\NetBeans\\8.2\\build.properties diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 4750962..5433500 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,4 +1,9 @@ + + + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/lectures/lecture02/MathService.java + + From 34ef5890dcfc07a6e24944b7ea30e8557fac96eb Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Sun, 17 Sep 2017 14:50:18 +0300 Subject: [PATCH 03/40] add new classes --- .idea/TextClassfierProject.iml | 9 + .idea/modules.xml | 8 + .idea/workspace.xml | 352 ++++++++++++++++++ .../lectures/lecture02/MathService.class | Bin 0 -> 2451 bytes .../caf82/lectures/lecture02/MathService.java | 89 +++++ .../lectures/lecture02/OperatorsExample.class | Bin 0 -> 3060 bytes 6 files changed, 458 insertions(+) create mode 100644 .idea/TextClassfierProject.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/workspace.xml create mode 100644 build/classes/ru/caf82/lectures/lecture02/MathService.class create mode 100644 src/ru/caf82/lectures/lecture02/MathService.java create mode 100644 src/ru/caf82/lectures/lecture02/OperatorsExample.class diff --git a/.idea/TextClassfierProject.iml b/.idea/TextClassfierProject.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/TextClassfierProject.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..75cbc25 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..e39760d --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + \ No newline at end of file From 1421ad2a512909691a0e31ba4d0e2b562f1d6a26 Mon Sep 17 00:00:00 2001 From: ilysko Date: Sun, 24 Sep 2017 13:10:22 +0300 Subject: [PATCH 09/40] Examples for lecture04. --- .../lecture04/ExceptionCatchingExample.class | Bin 0 -> 1144 bytes .../ExceptionCatchingIhExample.class | Bin 0 -> 1094 bytes .../lecture04/MyExceptionClassExample.class | Bin 0 -> 1255 bytes .../lecture04/StackTraceExample.class | Bin 0 -> 1247 bytes .../TemplateForMyExceptionClass.class | Bin 0 -> 674 bytes .../lecture04/ThrowExample$NegException.class | Bin 0 -> 583 bytes .../lectures/lecture04/ThrowExample.class | Bin 0 -> 1658 bytes .../lecture04/WorkWithExceptions.class | Bin 0 -> 1296 bytes nbproject/private/private.xml | 5 ++ .../lecture04/ExceptionCatchingExample.java | 21 +++++++ .../lecture04/ExceptionCatchingIhExample.java | 24 ++++++++ .../lecture04/MyExceptionClassExample.java | 52 ++++++++++++++++++ .../lectures/lecture04/StackTraceExample.java | 32 +++++++++++ .../lectures/lecture04/ThrowExample.java | 51 +++++++++++++++++ .../lecture04/WorkWithExceptions.java | 36 ++++++++++++ 15 files changed, 221 insertions(+) create mode 100644 build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/MyExceptionClassExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/StackTraceExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/TemplateForMyExceptionClass.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/ThrowExample$NegException.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/ThrowExample.class create mode 100644 build/classes/ru/caf82/lectures/lecture04/WorkWithExceptions.class create mode 100644 src/ru/caf82/lectures/lecture04/ExceptionCatchingExample.java create mode 100644 src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java create mode 100644 src/ru/caf82/lectures/lecture04/MyExceptionClassExample.java create mode 100644 src/ru/caf82/lectures/lecture04/StackTraceExample.java create mode 100644 src/ru/caf82/lectures/lecture04/ThrowExample.java create mode 100644 src/ru/caf82/lectures/lecture04/WorkWithExceptions.java diff --git a/build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingExample.class b/build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingExample.class new file mode 100644 index 0000000000000000000000000000000000000000..0a918cfc52f2f55a3fbba0a1dc7486779c1fc1e9 GIT binary patch literal 1144 zcmbVLOHUI~6#i~IblPEBpg?^f()w&cJBSrfPy+-KNl}xUZd_f)u?)_mnNAHZ-MRB0 zn7DEaEGi+9AHZt*hm7a8&=&2=CcXDOzI)F1&AIpV_wfmU0-h@vLMDbAxT)Y4Zp*k6 z#a&@$6-dZMF|A+*_eA8rjC>TDfGWzj`6Z? zZyVklzHLz?S#))7mAPjM|12o^J7$exzUb98oxfk4(=0>x>z+|NH)adk`kro7ebaT; zxUcV+PGx^e zN@X%Vh&JgB*R#3bi;=ijA*!Q&Ix)mcKG#2N@#>i_rR3H<-PkaN^2tt_zXaq3XBER3 zkuj&@Aqp}cshGzC9qQ`o!6BU+_eUMHP?nguc)gx4DcZ70Y-k z5;Uo)ZtcEm>4OH}gI~c(a2V{TsliF}bMtF(oM9;Z&!8BFyB%L`@6w1bgi4=kzG2f1 za_f{BZx6$CwbwL9pQdSWn}#&ns&O&QAXf#*qDvrUUx<;9XM2X(a}}b#+x8g7vbldT z42dquqU%%`VpZlDtK1GW0|6JY^SD8wU9-4kS`D3&HUGla;K7>(pC5Th01D;THg nY=ZnNxJpd5mNn5*v5IS$B*b<4t912bNJ&}-la!sJSP1Dq9JC$} literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.class b/build/classes/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.class new file mode 100644 index 0000000000000000000000000000000000000000..a50980c3529274b3eefa86b5cd98f84f2a236595 GIT binary patch literal 1094 zcmbVLO-~b16g{sko#}L-$d}*JB47dOAR?j|Hv|$$L6a&QSC4TlgPoaXIyJb%7!!B= z0~1%QOaucG68ZyNz4=4N`&ytSuyT@_ckj9Po_lWYn?HY#Y5=A%tDznJ38axxF`(ft z1~m*}SiwCNS!s@Fh+|a2n2P%f#uelk;?Hc?4xTeavm>hvu{rOp#gNL|uC-Ei)-3-O zUn>#PmG?|uTIIei{Sz=2tlJfanY>>$O#W_W(kNMGQ1z|KsWCBS%x{`jIj}u-rTYr&Qi_n*;R5T27-b#x%5z|b*)2Qt}R4!BbM-Bsmks zFe<)WM49^)t6}$MTUK|v`lZvM&vP*-WyxHk zI}^(;$s2NMIpJ#HHOLrxvLhE;AOoF#82Lm%5|N^BCwT^)jLx>v-(b7-@D=*T>tGaJ zWb2Itbfbs71bWd&h%EkrDA57AJw&>qhlm}ZZ3hE+=_&_M=^Q&if~+0rbu>x#ZoMW+ zBH~n=#2_@{kzI$09mJfZ4jqJ~sQ*>!n<0OYx(`wBaYCf3G}ScX*GSC}RKl;5$_4{FU@$`86^BAL{0oMm;_?|oa?igI3}Y4B6GxGI zE`n2j?$Al5;#awI#sgdJ+lNWnutSEeN)TC9UVF7}Iif0~K!mr8wN2~rYX7n-n$q^Y zJ%@+k{v~&tj@Y3dY7FT&wr9&-hRI^(1OLb^hkJFald+?kVpKmj&`S*$4^&95H~T~e zwpWi+Gp-0jUKi!aagJ+my}Ah0EZs`&SOU4+_89WT_kVk1Wq44hS+fJ&q~wVo1yxbD zl~l8LOuVY9YItE{9UCT0+|#gWVhhtIMloh0-!cQzwyRJImtKt@$tVSP6K_}z1dW}Tv8~FlO`ijIghCb7A0{6)p^jB6PGPE*V zp~&I^?SNbdvq2tJB2~IZvL7&tBn5T>sWyOK!T`VxQvHAo0kU@hCaA6&WS4qX-KI+` zH%Rvr@?4)J$pS8xmdKD2AxYG<7rs9kV@5qr)^} zsg)x1$OiSNb$Km~=cvCz4=dearK!e4V(55;xi)K?`crD_bZMF4Yv}#B1q@@cM=+h> N^OV5wm}~+IzX2Jt<@Nvo literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/StackTraceExample.class b/build/classes/ru/caf82/lectures/lecture04/StackTraceExample.class new file mode 100644 index 0000000000000000000000000000000000000000..98a7e659fcf383669deacb72ae3eea955422eb31 GIT binary patch literal 1247 zcmb7EO-~b16g{sUI_)sE$VZXV0xD<=!XTm|UoH&B#DXRzMC0mFhBDYrn_+5j?;p{P zYg_=)1o!?De}#D7P-w9x#!2RV+&S;wbMATVk6&L;0L-ft8;cRY0KzmZ%vIP=($FGK3E)5VEx~%KM zfQz=qOSaz>CNPrC{p(0enZkQ|SD}T~I*T>zajMo!_LpfrTUKb#V3Sv~)XEtJnnwn! zw!c%|T9Xy_xi_0@x9YsXmval~HC3rhhx@Yar*a#(&O09Gj|1p{P*!p5;?CkMRCN3Z z;(&_~u5ye7!3es!HqQX)K`(bv(DD-}OX1~A`V$5w zGBfkq7jz70hlm_P{}2|RPk$Z+38PFELO3XwVnHCrh{3UwwwuUuo?dIO*b-BHbh0kEe%g$ Ngsv%;H#mlH^EZuQ0J#7F literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/TemplateForMyExceptionClass.class b/build/classes/ru/caf82/lectures/lecture04/TemplateForMyExceptionClass.class new file mode 100644 index 0000000000000000000000000000000000000000..8e9a99f346aaf61f1cee89926d25ca72eb1d79fc GIT binary patch literal 674 zcmbV}O;5r=5Qg97qg6yv6vU5%M}&kLAW?(iLf}-rK)5e;g__cmeklGdPb41v0sbiC zY(XGZFK)6kv)h?x-r0V9zP$se<0OS7a?<3bIaEQ-LkmnH5hV5{gFR$&Eob@>-w%~4;xa5Iu@SChhgU*2@HkxvL!UE zWK@$|gRZ_Zq`FSv8lq#$kxrv>+EY$aMMd^YLxC#Iwlv2Km;aoRVSlB6sUBy3S67mct0G$~W& uDy8xau_&QJO|_7apJ%NRc903F3U+^E#iOh$v1)&?_K+n8Jqsy`;ou8i-i#pt literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/ThrowExample$NegException.class b/build/classes/ru/caf82/lectures/lecture04/ThrowExample$NegException.class new file mode 100644 index 0000000000000000000000000000000000000000..2afbf2d988a2a84d70f5f1591332add0986ba7ed GIT binary patch literal 583 zcmbV~%}&BV6otZ3Z&<>lu2VE!jLPt@p6>K2$0nt2x*8l(j literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/ThrowExample.class b/build/classes/ru/caf82/lectures/lecture04/ThrowExample.class new file mode 100644 index 0000000000000000000000000000000000000000..22536fcda8541a96102c6aabd4d28bac5c8dd8d7 GIT binary patch literal 1658 zcma)6O-~zF6g_V|X6%U}#t@f4X-)G{n?jtVq)8hZ@*%2PxM?LKT2v|0*co6_f6(zb zrOhTy)DJ0b~k6;})PWj4Iy z+;dcqU^0_QWdwx9zglwwz4M-x|K>AmwcWt%5N8{`XgM4pp8Ps{*Scq=3sz}4J@2_r zY5B6^uGwn>Z+Gooa~*G`XnRh+149BA56$*uw{oo1Eq9qb1`g;iV9uATZr=XHQEK&f z4}C_ljbH$S0;7A(4`3%SE1&s~6aFulSV<3Ev`{%@)o`Cd5evFsaE;I@3KNIZ}=|5sU89VSRgF=!KLu;T;v z{aLOv+G@MwKPG81ulql;gfw5r&cJj8ALB{{!x%9z6Twwn6BuiDmAkSbU&?}l9JSAmrL;~-WeuN$nWUghPD_B zY(n21d8)kNVytHq#_sS);ZNoSnz(U(a1^=@1APb~M!Yw1q}eCl!lFOQ9HQbaT6`I4 z>(Kgo8Bw(we?iub;T`UhhgfU#xc?VIpXqnFu&C-n>d4b4t=*sTS(q5m{ z-r9#X)P)sk+I_^`ATe;n z5TnEc98RGOvU&*T7@ejZGu*jK`9GySN1?KmC;YSf(G@#8H%bKJHdqj literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture04/WorkWithExceptions.class b/build/classes/ru/caf82/lectures/lecture04/WorkWithExceptions.class new file mode 100644 index 0000000000000000000000000000000000000000..6b0beaccc639034d16f139a15b16931b288cfd1b GIT binary patch literal 1296 zcmaJfBgoqjAaW?Fk-;Akikd}qZl(WZs9d1EadUV z#H5KS1Jf2P%ovz8FelKx;)lNaD9|-Ey)BSkjcQV$r{aflvsvGh@i%8LV5C@yTqoFe zVqfpu!L0K9hQLB4ZkAnV|NUY)kgjURvT?ImST65G@zIX2ytPwT9xFcz8y`sPAB0iN zy4G!2Am=*D_12|65PbS8ht7AW95~@YIn5*bNmV)S(S~!})?q0xj!r&#(y0kdxUqDU z+>|FNWXJOZsdf0_ftIorFwd$+&DfQnc_c7+U*){!&f_V11p5A?!@%1-=1~@SQHg>% z+qYe(dEhDASN37Ep=^&nMhz_F@eYf5^y@+^JJPQCwQy3|Dn7GSL=Y|8@}@bqAKFQ8 zrl#lZBwJV1#RQC6WH;){6IgnvG}ca?`f(t&nI(bwhoJZSAkcg3erxZL z6TTCwo;8%L^8!Up9<)d1N9C`vAF8V2FzOsx(!sl7`Z?A~K}g(G$E=Csq(0~iIn)_X zUGa$bJI@QRe~%#anE3AHuFS8{(V0t#b1pI{@ZH@CcB9C3K1o0yo^b~~8fIzmBEK4J zULmu4iLPs|JMm@*-fZIsn3E+c!|z}!W1o8+Dc)47{6x0+=mOp62?I=?ceS(?i3iP? zw2@d)05fuo4&iwVQ*1Mqct$_#MvLJ^%6Z7W<}A!y!1#fDi_%Ofv(SKqa)4da z#$JdGHP5~u4 m0EQ`Gi~>eTXH&o^<&1ZTD5Ty?_eB(_J88Ye_PpXcgW-Q0KmqUo literal 0 HcmV?d00001 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 4750962..ba3008f 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -1,4 +1,9 @@ + + + file:/home/ilysko/Desktop/WorkLearn/Coding/Java/JavaTeachingInMiphyaga/TextClassifierProject/src/ru/caf82/lectures/lecture02/StringProcessing.java + + diff --git a/src/ru/caf82/lectures/lecture04/ExceptionCatchingExample.java b/src/ru/caf82/lectures/lecture04/ExceptionCatchingExample.java new file mode 100644 index 0000000..8456e7c --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/ExceptionCatchingExample.java @@ -0,0 +1,21 @@ +package ru.caf82.lectures.lecture04; + + +public class ExceptionCatchingExample { + + public static void main(String[] args) { + try { + System.out.println(6 / 0); + } catch (ArithmeticException ex) { + System.out.println("Ошибка! Ошибка!"); + System.out.println(ex.toString()); + } + + try { + System.out.println(Long.parseLong("Mama")); + } catch (NumberFormatException ex) { + System.out.println("Снова косяк!"); + System.out.println(ex.toString()); + } + } +} diff --git a/src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java b/src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java new file mode 100644 index 0000000..c4dfc32 --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java @@ -0,0 +1,24 @@ +package ru.caf82.lectures.lecture04; + +public class ExceptionCatchingIhExample { + + public static void main(String[] args) { +// try { +// System.out.println(6 / 0); +// } catch (Exception ex) { +// System.out.println("Ошибка верхнего увроня"); +// } catch (ArithmeticException ex) { +// System.out.println("Ошибка! Ошибка!"); +// System.out.println(ex.toString()); +// } + + try { + System.out.println(Long.parseLong("Mama")); + } catch (NumberFormatException ex) { + System.out.println("Снова косяк!"); + System.out.println(ex.toString()); + } catch (Exception ex) { + System.out.println("Ошибка верхнего уровня"); + } + } +} diff --git a/src/ru/caf82/lectures/lecture04/MyExceptionClassExample.java b/src/ru/caf82/lectures/lecture04/MyExceptionClassExample.java new file mode 100644 index 0000000..b741e17 --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/MyExceptionClassExample.java @@ -0,0 +1,52 @@ +package ru.caf82.lectures.lecture04; + +/** + * Created by ilysko on 24.09.17. + */ +public class MyExceptionClassExample extends TemplateForMyExceptionClass { + int amountOfSmth; + + void someMethod() { + System.out.println(amountOfSmth); + } + + void f() { + someMethod(); + } + + public MyExceptionClassExample() { + super(); + } + + public MyExceptionClassExample(Exception e) { + super(e); + } + + public MyExceptionClassExample(int amountOfSmth) { + super(); + this.amountOfSmth = amountOfSmth; + } + + public MyExceptionClassExample(String messageFullOfAnger) { + super(messageFullOfAnger); + } + + public static void main(String[] args) { + System.out.println("let's throw an exception!"); +// throw new MyExceptionClassExample("lol"); + } +} + +class TemplateForMyExceptionClass extends Exception { + TemplateForMyExceptionClass() { + super(); + } + + TemplateForMyExceptionClass(String message) { + super(message); + } + + TemplateForMyExceptionClass(Exception e) { + super(e); + } +} diff --git a/src/ru/caf82/lectures/lecture04/StackTraceExample.java b/src/ru/caf82/lectures/lecture04/StackTraceExample.java new file mode 100644 index 0000000..96b7f71 --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/StackTraceExample.java @@ -0,0 +1,32 @@ +package ru.caf82.lectures.lecture04; + +/** + * Created by ilysko on 24.09.17. + */ +public class StackTraceExample { + static void f() { + try { + throw new Exception(); + } catch (Exception e) { + for (StackTraceElement ste : e.getStackTrace()) { + System.out.println(ste.getMethodName()); + } + } + } + + static void g() { + f(); + } + + static void h() { + g(); + } + + public static void main(String[] args) { + f(); + System.out.println("---------------"); + g(); + System.out.println("---------------"); + h(); + } +} diff --git a/src/ru/caf82/lectures/lecture04/ThrowExample.java b/src/ru/caf82/lectures/lecture04/ThrowExample.java new file mode 100644 index 0000000..8c3a31a --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/ThrowExample.java @@ -0,0 +1,51 @@ +package ru.caf82.lectures.lecture04; + +public class ThrowExample { + + public static int divide(int a, int b) throws ArithmeticException, NegException { + if (b == 0) { + throw new ArithmeticException("Ты че как лох-то, на нуль делить нельзя"); + } else if( b < 0) { + throw new NegException("Мы решили, что на отрицательные числа делить нельзя"); + } + return a / b; + } + + public static void main(String[] args) { + try { + System.out.println(divide(5, 2)); + System.out.println(divide(5, 0)); + } catch (ArithmeticException ex){ + System.out.println("Мы поймали ошибку!"); + } catch (Exception ex) { + // + } + try { + System.out.println(divide(5, 2)); + System.out.println(divide(5, -1)); + } catch (NegException ex){ + System.out.println("Мы поймали ошибку!"); + } catch (Exception ex) { + // + } + try { + System.out.println(divide(5, -1)); + System.out.println(divide(5, 0)); + } catch (ArithmeticException ex){ + System.out.println("Мы поймали ошибку!"); + } catch (NegException ex) { + System.out.println("Отрицательное деление"); + } + + } + + + public static class NegException extends Exception { + NegException(){ + super(); + } + NegException(String message) { + super(message); + } + } +} diff --git a/src/ru/caf82/lectures/lecture04/WorkWithExceptions.java b/src/ru/caf82/lectures/lecture04/WorkWithExceptions.java new file mode 100644 index 0000000..0791ab8 --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/WorkWithExceptions.java @@ -0,0 +1,36 @@ +package ru.caf82.lectures.lecture04; + +/** + * Created by ilysko on 24.09.17. + */ +public class WorkWithExceptions { + void ignore() throws Exception { + throw new Exception(); + } + + void catchHere() { + try { + throw new Exception(); + } catch (Exception e) { + System.out.println("Lol, i caught it just here!"); + } + } + + void throwAhead() { + try { + ignore(); + } catch (Exception e) { + System.out.println("We didn't try to catch exception in ignore(). " + + "We did it here"); + } + } + + void createNewExceptionWhileWorkingWithOld() throws MyExceptionClassExample { + try { + ignore(); + } catch (Exception e) { + System.out.println("do smth"); + throw new MyExceptionClassExample(e); + } + } +} From 4acee8796dcd00cd1ffd86c7c71760c554c5f752 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 25 Sep 2017 09:16:04 +0300 Subject: [PATCH 10/40] new commit --- .../lectures/diagramBomberman/GameObject.class | Bin 0 -> 175 bytes .../lectures/diagramBomberman/GameSession.class | Bin 0 -> 670 bytes .../caf82/lectures/diagramBomberman/Movable.class | Bin 0 -> 258 bytes .../lectures/diagramBomberman/Positioanable.class | Bin 0 -> 247 bytes .../lectures/diagramBomberman/Temporary.class | Bin 0 -> 239 bytes .../lectures/diagramBomberman/Tickable.class | Bin 0 -> 153 bytes .../lectures/diagramBomberman/GameObject.java | 9 +++++++++ .../lectures/diagramBomberman/GameSession.java | 11 +++++++++++ .../caf82/lectures/diagramBomberman/Movable.java | 8 ++++++++ .../lectures/diagramBomberman/Positioanable.java | 9 +++++++++ .../lectures/diagramBomberman/Temporary.java | 9 +++++++++ .../caf82/lectures/diagramBomberman/Tickable.java | 8 ++++++++ 12 files changed, 54 insertions(+) create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/GameObject.class create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/GameSession.class create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/Movable.class create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/Positioanable.class create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/Temporary.class create mode 100644 build/classes/ru/caf82/lectures/diagramBomberman/Tickable.class create mode 100644 src/ru/caf82/lectures/diagramBomberman/GameObject.java create mode 100644 src/ru/caf82/lectures/diagramBomberman/GameSession.java create mode 100644 src/ru/caf82/lectures/diagramBomberman/Movable.java create mode 100644 src/ru/caf82/lectures/diagramBomberman/Positioanable.java create mode 100644 src/ru/caf82/lectures/diagramBomberman/Temporary.java create mode 100644 src/ru/caf82/lectures/diagramBomberman/Tickable.java diff --git a/build/classes/ru/caf82/lectures/diagramBomberman/GameObject.class b/build/classes/ru/caf82/lectures/diagramBomberman/GameObject.class new file mode 100644 index 0000000000000000000000000000000000000000..b15820a79fe8fa65b0985fc92843bb2b0834deaf GIT binary patch literal 175 zcmYL@F%H5o6hr+>+dvmM1`H4hF)%a0$biKD8`6?0X{9vfa10!PLm^TzFj=zoY`;Ix z7l0iKfvLcZkoAFmAWW94D{s%unp}xoorwn}#1uSo=XLuJ&7L yqd9op%bVfavpaOI)ZTF`{}5p@V$yP3%U@4UASCe$kfd=PDG)UqH75D!Lwo^u$tm{$ literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/diagramBomberman/GameSession.class b/build/classes/ru/caf82/lectures/diagramBomberman/GameSession.class new file mode 100644 index 0000000000000000000000000000000000000000..1bf0a8c217f6d0a17c69898067f775a257e140ec GIT binary patch literal 670 zcmb7?O;6iE5Qg6k2~LblA$+!!LdYedQe0I?AO#^oCAe4xDN*hlXB!smU9?_D>d%5h zD{)@WYQp zXj3B+eC`jK`uUl0<6Nr8-uI*9=W<#vLW>P;ixWdO9_s2*gB0$4Y6- zEs2T099;1U_am;x{`o{0BS(T5?o@v&v;Gze{7xqKP({tbriZWCVyI*V8xFQTG_b?a zd0)#^pwPqcipFI4_8*Ksm7Q*|0O+8s*unZGE%0$d7FfGW8KNbLo(ki!`kb6}lp2}{rG%AGX; literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/diagramBomberman/Movable.class b/build/classes/ru/caf82/lectures/diagramBomberman/Movable.class new file mode 100644 index 0000000000000000000000000000000000000000..bf8113d6e6afb160f287f4f73309612bd7c72c49 GIT binary patch literal 258 zcma)%O$x#=5QX2=YP44H82*3}apBs9J5f;FPivIaq=9IAI2RtkLy0MP0C_MB!}l?~ z_viTnu*5*1Cy)sA1yVw6U9AYM(fCA24zBXK+GrC_>DJYp88s`oX2Qf*GUv-`A&tr( zl~;Fp)_nDB*Uo0jTQ23#APgHv8ZNJLmlc60%>VHB?yeu&aoPMOO#e`hI=?k^hd_uz ST8KkWiV1CWnhhe%2;DCMsYllU literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/diagramBomberman/Positioanable.class b/build/classes/ru/caf82/lectures/diagramBomberman/Positioanable.class new file mode 100644 index 0000000000000000000000000000000000000000..dca9d1bae49417d31903f6eb64f1eb486e043968 GIT binary patch literal 247 zcma)%F$%&!5Jmqa(P&H|o=ND~@tG%lO8G zxv53W*VRJgGOlVPOL0j#Fas zz21)}fCYL29f7VuM2J#V#<{b5Z4{v~8gB@F&sN&%;{2uEU0%6Ft#sxqgS|4>+_AgQ zE_`Fc#8ook({e5|m6VlJg*<9b9h*2e2jvV~`Ev-v+L9UDRBjI!ZxE(`EUek6Z$Bgu W0)GwvOwc4W(E@yib$Tvpj`j!9DL>x; literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/diagramBomberman/Tickable.class b/build/classes/ru/caf82/lectures/diagramBomberman/Tickable.class new file mode 100644 index 0000000000000000000000000000000000000000..839dc93e31cdc28094766613eb4f2c6da028a150 GIT binary patch literal 153 zcmXwyu?oU46h-f=u~9+rGZevqI5<1FIw(Y zfE}h1Qer|7y)$>hXt}x)X6G(NV~@^T!u*mS*4}O!ellSllQLZGx5``7r)VGQ=D3a= m4qebT25!|~AuI+-d2VZU(oGgh0-?xpfJ6>L41{ss0_6{oCM9nG literal 0 HcmV?d00001 diff --git a/src/ru/caf82/lectures/diagramBomberman/GameObject.java b/src/ru/caf82/lectures/diagramBomberman/GameObject.java new file mode 100644 index 0000000..7006157 --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/GameObject.java @@ -0,0 +1,9 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public interface GameObject { + void start(); + void finish(); +} diff --git a/src/ru/caf82/lectures/diagramBomberman/GameSession.java b/src/ru/caf82/lectures/diagramBomberman/GameSession.java new file mode 100644 index 0000000..4877b8f --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/GameSession.java @@ -0,0 +1,11 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public class GameSession implements Tickable { + @Override + public void tick() { + System.out.println("tick!"); + } +} diff --git a/src/ru/caf82/lectures/diagramBomberman/Movable.java b/src/ru/caf82/lectures/diagramBomberman/Movable.java new file mode 100644 index 0000000..6629aa9 --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/Movable.java @@ -0,0 +1,8 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public interface Movable extends Positioanable, Tickable{ + void move(); +} diff --git a/src/ru/caf82/lectures/diagramBomberman/Positioanable.java b/src/ru/caf82/lectures/diagramBomberman/Positioanable.java new file mode 100644 index 0000000..5b2a20e --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/Positioanable.java @@ -0,0 +1,9 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public interface Positioanable extends GameObject { + int getXPosition(); + int getYPosition(); +} diff --git a/src/ru/caf82/lectures/diagramBomberman/Temporary.java b/src/ru/caf82/lectures/diagramBomberman/Temporary.java new file mode 100644 index 0000000..e32ee17 --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/Temporary.java @@ -0,0 +1,9 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public interface Temporary extends GameObject { + int getBornTime(); + int getFinishTime(); +} diff --git a/src/ru/caf82/lectures/diagramBomberman/Tickable.java b/src/ru/caf82/lectures/diagramBomberman/Tickable.java new file mode 100644 index 0000000..8d51018 --- /dev/null +++ b/src/ru/caf82/lectures/diagramBomberman/Tickable.java @@ -0,0 +1,8 @@ +package ru.caf82.lectures.diagramBomberman; + +/** + * Created by ilysko on 18.09.17. + */ +public interface Tickable { + void tick(); +} From a5482060d7c20a820bb533777da2a483c17080b7 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 25 Sep 2017 11:47:08 +0300 Subject: [PATCH 11/40] commit 3 files --- .../lectures/lecture04/DivideOnZero.class | Bin 0 -> 692 bytes nbproject/private/private.xml | 6 +- .../lectures/lecture04/DivideOnZero.java | 54 ++++++++++++++++++ 3 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 build/classes/ru/caf82/lectures/lecture04/DivideOnZero.class create mode 100644 src/ru/caf82/lectures/lecture04/DivideOnZero.java diff --git a/build/classes/ru/caf82/lectures/lecture04/DivideOnZero.class b/build/classes/ru/caf82/lectures/lecture04/DivideOnZero.class new file mode 100644 index 0000000000000000000000000000000000000000..88fb53de5d233ca8aaf64081281cabde40da70c7 GIT binary patch literal 692 zcma)3%Wl&^6g`tTp2WDM4_e-j@~YcKji3^hg4j?YRWcMQRTi+CxYKlsV^TvsU znCLh!te*V2JlYC(%&9rhd+A$kvmQH)l}QCwf_KreI#pq!(oxvYtw~3{%7L;YYA*ew zEFcamqq_og{anTGU#XMIio_iOub&k*)-O%zcVV{eX4%PyL|bCj$6eg>v4|y!`#v7v zp+NAz0|?AdUGEK#IWE0Uq5UJ9eW*7!L+pQ?>{^YvnOf#= zSU{eXq=YMTg5C82R{4c4{}pJ0RkV3_n1zgjv9<9P;u9|ocs$(-?BW9NeobJUW7fe% zbcvLYx5+Lad!NzxhUOPIQw5JTV2!+BM#aNC7KpdYMV_lXWh}YU?X}LL)>$RlfJ3M@ WQ%h|!dxA?uX>LbinY@*XbNM$EW{i3O literal 0 HcmV?d00001 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 878f965..548a2a8 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,12 +2,8 @@ -<<<<<<< HEAD - -======= - file:/home/ilysko/Desktop/WorkLearn/Coding/Java/JavaTeachingInMiphyaga/TextClassifierProject/src/ru/caf82/lectures/lecture02/StringProcessing.java + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java ->>>>>>> 1421ad2a512909691a0e31ba4d0e2b562f1d6a26 diff --git a/src/ru/caf82/lectures/lecture04/DivideOnZero.java b/src/ru/caf82/lectures/lecture04/DivideOnZero.java new file mode 100644 index 0000000..9511f32 --- /dev/null +++ b/src/ru/caf82/lectures/lecture04/DivideOnZero.java @@ -0,0 +1,54 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package ru.caf82.lectures.lecture04; + +import java.util.InputMismatchException; +import java.util.Scanner; + +/** + * + * @author 1 + */ +public class DivideOnZero { + public static void main(String[] args) + { + /*try + { + Scanner scanner = new Scanner(System.in); + int x = scanner.nextInt(); + System.out.println(1000/x); + } + catch (InputMismatchException e) + { + System.out.println("Поймали ошибку со строкой! Е-еее!"); + } + + catch (ArithmeticException e) + { + System.out.println("Поймали ошибку с делением на 0! Е-еее"); + } + + finally + { + System.out.println("А тут мы всегда"); + } */ + + System.out.println(f()); + } + + static int f() + { + try + { + return 3; + } + + finally + { + return 2; + } + } +} From 97874306ddd36f75e3f642b7afe5e57daa8d9037 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Wed, 27 Sep 2017 22:44:32 +0300 Subject: [PATCH 12/40] delete MathService.java --- .../caf82/lectures/lecture02/MathService.java | 84 ------------------- 1 file changed, 84 deletions(-) delete mode 100644 src/ru/caf82/lectures/lecture02/MathService.java diff --git a/src/ru/caf82/lectures/lecture02/MathService.java b/src/ru/caf82/lectures/lecture02/MathService.java deleted file mode 100644 index 81c7219..0000000 --- a/src/ru/caf82/lectures/lecture02/MathService.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ -package ru.caf82.lectures.lecture02; - -/** - * @author 1 - */ -public class MathService { - - public static void main(String[] args) { - System.out.println("Нормализация вектора\n"); - double[] vector = {1, 2, 0, 3}; - for (double element : vectorNormalization(vector)) - System.out.printf("%.2f ", element); - - System.out.println("\n"); - - - System.out.println("Нормализация матрицы\n"); - - double[][] matrix = {{2, 3, 4}, {-3, 1.6, 5}, {39, 28, 1.22}}; - - double proverka[][] = matrixNormalization(matrix); - - for (int i = 0; i < proverka.length; i++) { - for (double element : proverka[i]) - System.out.printf("%.2f ", element); - System.out.println(); - } - } - - public static double dotProduct(double[] a, double[] b) { - double result = 0; - for (int i = 0; i < a.length; i++) - result += a[i] * b[i]; - - return result; - } - - public static double sigmoid(double x) { - return 1 / (1 + Math.exp(-x)); - } - - public static double sigmoid(double[] x, double[] w) { - return sigmoid(dotProduct(x, w)); - } - - public static double[] vectorNormalization(double[] x) { - if (x.length <= 1) - return x; - - double average = 0; - - for (double element : x) - average += element; - - average /= x.length; - - - double D = 0; - - for (double element : x) - D += Math.pow(element - average, 2); - - D /= x.length - 1; - - for (int i = 0; i < x.length; i++) - - x[i] = (x[i] - average) / Math.sqrt(D); - - return x; - } - - public static double[][] matrixNormalization(double[][] x) { - for (int i = 0; i < x.length; i++) - x[i] = vectorNormalization(x[i]); - - return x; - } -} - From 5cb04b1da861a949b34c1e0569e0b2d4569276d1 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Wed, 27 Sep 2017 23:19:25 +0300 Subject: [PATCH 13/40] new commit --- .../machinelearning/models/AbstractModel.class | Bin 0 -> 362 bytes .../preprocessing/CountVectorizer.class | Bin 0 -> 538 bytes .../preprocessing/PorterStemmer.class | Bin 0 -> 528 bytes .../preprocessing/SequenceProcessor.class | Bin 0 -> 171 bytes .../preprocessing/TfidfVectorizer.class | Bin 0 -> 538 bytes .../preprocessing/Transformer.class | Bin 0 -> 159 bytes .../preprocessing/WordProcessor.class | Bin 0 -> 163 bytes .../caf82/result/workwithfiles/FileReader.class | Bin 0 -> 393 bytes .../caf82/result/workwithfiles/FileWorker.class | Bin 0 -> 141 bytes .../caf82/result/workwithfiles/FileWriter.class | Bin 0 -> 393 bytes .../caf82/lectures/lecture02/MathService.class | Bin 2451 -> 0 bytes .../preprocessing/PorterStemmer.class | Bin 0 -> 488 bytes .../preprocessing/SequenceProcessor.class | Bin 0 -> 161 bytes .../preprocessing/TfidfVectorizer.class | Bin 0 -> 637 bytes .../caf82/result/workwithfiles/FileWorker.class | Bin 0 -> 131 bytes nbproject/private/private.xml | 4 +--- .../machinelearning/models/AbstractModel.java | 14 ++++++++++++++ .../preprocessing/CountVectorizer.java | 2 +- .../preprocessing/PorterStemmer.java | 2 +- .../preprocessing/SequenceProcessor.java | 2 +- .../preprocessing/TfidfVectorizer.java | 2 +- .../preprocessing/Transformer.java | 2 +- .../preprocessing/WordProcessor.java | 2 +- .../caf82/result/workwithfiles/FileReader.java | 2 +- .../caf82/result/workwithfiles/FileWorker.java | 2 +- .../caf82/result/workwithfiles/FileWriter.java | 2 +- 26 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/AbstractModel.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class create mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class create mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class create mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileWriter.class delete mode 100644 build/classes/ru/caf82/lectures/lecture02/MathService.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class create mode 100644 build/classes/ru/caf82/result/workwithfiles/FileWorker.class create mode 100644 src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java (64%) rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java (63%) rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java (55%) rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java (64%) rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java (53%) rename {result/src => src}/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java (54%) rename {result/src => src}/main/java/ru/caf82/result/workwithfiles/FileReader.java (65%) rename {result/src => src}/main/java/ru/caf82/result/workwithfiles/FileWorker.java (60%) rename {result/src => src}/main/java/ru/caf82/result/workwithfiles/FileWriter.java (65%) diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/AbstractModel.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/AbstractModel.class new file mode 100644 index 0000000000000000000000000000000000000000..1833bbf9b99256d8d718f990b2ce8a760329dcd6 GIT binary patch literal 362 zcmbtQ%SyyR5UkGTp)tCPf8b3$I3OMbWpNQaW!HnU_s%%FvrH10O#ClTf(Jjqj}kk< zi)Xu`rmF_3n*RF!_yll)S&j+zGaO`?64Gni*f1wdj!)Kv__lpAglTCTv+C>0_(!gs zD2HXM*{#{zf&Yqe*w~J6Q`T%7wdGeHW7*`s+8P~jgh=i&6iG{pU@Ao{T))`-o(B5n?oDl}e6$g5ZWQz2ZRg=nd*s agb160Es<+%3wBm@6I)W%&$k65?0f?RzK1Sif$M+iCopIu=ZcfuXDg$< z!05NuQ&MHMaKwZBA>f0f`S|O99N_=~Z!AEFh!-gM@c4`y%w)@f==cTVnS}tGj9r!+ SOc;A@9bt>B=J_^bfSpfp+?IO) literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class new file mode 100644 index 0000000000000000000000000000000000000000..1d4328c2b55850014546bf1d5b3bf121c71c318f GIT binary patch literal 171 zcmZWjO9}!p6idfX!IdkIVL@EX2?SRPbAo4iYKKl|e4TnY7aqVviLEZpA|!-_yxxx| zfGxDfOk=LFX!<0Uch0lIs^MGWVEHJ$0ED&a7=zQ9oef3 o?3pCEa501M@M{j}u&Unh{;ncDn^9zM4-zrd;WUes%0DTEFB>(^b literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class new file mode 100644 index 0000000000000000000000000000000000000000..b6253c2175102981354ddf7739b8d5b3999c5260 GIT binary patch literal 538 zcmb_Z%Sr=55UkleR%0|V<_El~2M5H1VDJ)9grGt~?vqKcnXo$(dv`tfSDpk9et;h( z_C`-0gA5d1HB43a^yk<62Y_?*Td1KEqZ?yCMlZ&JLUZ7}E3Oo3N5@lz`Y_B%p)+!x z?#gUNJTbFWl-?*{DCfd||Oiv|wOAkLY238nu>NR2G^CWOaj6+1Sy9jkOWR*&ee1hPXFumqLE@t4#1%h2^B7^v5Pl;f1WP@ zJ7|rC#!_K*PDLyqoo9vhMJVPzNnqIw^dN;pAQw%$jTB?4-*1g@E`BnB?A=B7OcGtZ knNfI@WI5-S{!kVC19+Su+nPH9q@RqrtW0;f_gO#lD@ literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class new file mode 100644 index 0000000000000000000000000000000000000000..7ebcc50f221d403ffac2ff0c92c754b2be5776d8 GIT binary patch literal 163 zcmX^0Z`VEs1_l!bc6J6KT3QX z1kdHc@MhjJJIwdb{tLhaqXcc7#u&sH#yBH%?@VF*J)wPZIU{tY<$?)=)D-+!Z!&hT zI&Mt6VQ{#>#P3Td%gId*2$rS{lohdJueO zyy5A>N!W_CD7OUjZ?q&bq2 kK!UL_)o>uX+JQbrXrU(<&H;}E`^_F9!LcwB9$uaN0tfhG9smFU literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class b/build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class new file mode 100644 index 0000000000000000000000000000000000000000..2de56315de22ef745a1520d1940ddb1e6dcfd754 GIT binary patch literal 141 zcmX^0Z`VEs1_l!bc6J6L(|rSs3XTr52awl<1cO)s<(KWTXN06zd~&GBOB&)#oJUrR)1AWu+#U V0PSI9U;cbjB!Ee-kZYs8KHeOUJ*L;@`VY5)D-+!?=p5z zIc%^o4anJ^L_UY-8}aAjkh literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/lectures/lecture02/MathService.class b/build/classes/ru/caf82/lectures/lecture02/MathService.class deleted file mode 100644 index ad006794040b9f4bd84e4f1e39c6fb47569b232d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2451 zcma)8T~HHO6#h2J?j}nF1cFdRV=ItEFhUhY5KyQE3aE)cjkL8(SVACSF(hdF&~Y69 zX8O?QcBU`%p^s9>YHBsp=RSqUI(_n`Gj*nY=yb+fEB)>!VsxBNGn>74&pr1$-#O>I zoBa6nP7c6sWHgjv+=U}J>clY(A%vBFu85D)?<`C-G~>7vCsdr&a0>4Vw}=y`otRLu zSLv@TxG6sr{guAIJ{O-al>VCHQvbjOYo_$~6fJ#!T;7sB_VBU*e@`I3ui*on5sx2= zn=T$F#Vx90N`lf8pO2?|CD?ublM);Q=9D3!Vl+N)jAxRQM(VgenV_X=)QswhlX@yH zo{L6DdM3Uo!9SYH1f%-&zK&qRh^8|sWAWK!S4VJ6PtSyn)KWZZbTdFwkIze}^-YY< z>Pvbsq0h&H;dClKAL|wbR3l*|jrp_$X^`JIzr)<6r(z6L{fbRYVTnP_lmy!Zw(5t$pL zNy0IiOhPOz#$!n{K1DLVf(K(r=SZp$e%wqY^+fz*Jsmfhph6_SAfW0Dug6%z>H@Qu z9GyP$^jloDu$f6kjl*$K@XC_9?G&YQqXj+{h8xp}N$};r%;#1wSx~kjr_OyJF6G1CIE1wt5tp0*U^zQink^V`*Jo(i0iu z$h6or=r7q;a9}XSf~7;xD^N>CS}1LI5#&X7#3_H?1krBhXq;c*eZi!#WZ$4AG{@rE zR2tiOc+0Fqu7ZVxk9R+xgB&G}a^N*0#uvOV_!J*z&Ble0=#8Cq|6p_nA5v2xdXmm#wuCdl!uf5aZaWpPtd#lIM-X)7| zn&TeIBKA5t3wQVyHk`WTkiK5~SuB+kQH&KFm3yd+*cE|qVKait2sPLk3P&78d$kqW zW7#*+E*I_fmc7BUH-^Gvtyydxx45+BmT|bvQ_#2xgiLDY<9|GUv@L(6(A=9fcbK*A7N(bJAL)4wW6?^FG#RGKGTOx88 z`_RQM-o!Zeb7n_3J%Uiy2rH}TQBlc@aqtMuPcfz9059n&YAo|3_#RU!E^z<}C^T}7 za*#!s@?ooJ0T#{U3$TSd_??RmTQ&IAcbz_kBGg*`+exE|@@ZzuO-$2gB^Drc8THSS zAo+e$7auPUT1nXGdx&Yv0)+0EJ`2MbdVZ7gb2qoEO3k&o@H(qI9{RNgdTf|;AP{49u<0Tux3uoQpZA% zLLk?QHPY}2hUq8Keu86rQHAYLooi%38CKfYMYw4VRZxWKxy}0o8av*=e(|TF*zp-E zNA#=S-qRp*uL?8-8anuD315;}oZm{at`g^iC&0=7P#ZaJ!m;&U+IW@(V@W`faTiB% TMqIExfsIjXxHL+G4P*ZT4Jr3< diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class new file mode 100644 index 0000000000000000000000000000000000000000..a4e927a44390bef15901d202ea9660408f4d660a GIT binary patch literal 488 zcmbtRK~BRk5FDpT1EJ7T_y9NHfF;BMRN#WdDS}F^%Gq&U>MDt=jl;h82d4XF%AT}*S56&R-kiyG7|{z+}sHCQ(Kyc zy2uPoRhF|dOr2KwOp$H)uNeBJtpsjTs-;$o%X3Mls&g+3rI+lG8%3oppXHj&nw&OO z)v&Q6Z)oC8Q5YHtBokMYHuts-`g41>QZK59E@FYvKT-q+jg!n3=RamEqrJe@W`f-HlcV|g=La0&2mx;*K!}JJBlz%uj9biP%Yo?h4dRuB0NadRmK#hMdu<(I MhpXoKE@ObbZ-H%xzW@LL literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class new file mode 100644 index 0000000000000000000000000000000000000000..8708158d796583b150ddb60a5e448b4a6574af70 GIT binary patch literal 161 zcmZWjI|>3Z6r8ty0#;TY!+==W+1V=W31WC^mTa=VY&@KW2k=m0f~8Xo48wfhpXUp} z7D{2JFefb9n8otJc_yq{zGn`WPZBMs6lL9+hav1GYilmMjTTPXkGePZ<^p>*5?r|I iL3sFOs`{%TENhYWrntv*$962+gr=OSAWRB3n0^64gD-Xf literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class new file mode 100644 index 0000000000000000000000000000000000000000..e35a352d53592b10c5e8d2b72d6d72e3f3242a6b GIT binary patch literal 637 zcmbtRO-~y!5PePp8oS9>4~cVvM30;X@s>F)EmgFdyM#gawAt9c^{K%TQfy zbs1`VuCExT+S;o9BI_xCEP93_&9;-mbcNR?9|mjrnGOu!+P+AnNH^CLuR>w+Bop$C z6pRwyYI~Xtyc&2XRR|?JPIW)+Dw#X4e=EPuP~VYe*hk!Pg_r7wF00P|m%4T?E=2=% zj4>>geqsa(9u+p%nfiVu)gaf-G8~*(>9T<~Ww$&$NpeZE@y}ceYhBJ$ZTmd@%6iVk zeCT}P(ufdvM_m-kN_F_$wDV=nMTW2M8kAxBwdaH0Icy46L*pND(DbFys+I|)6 zYF zs-K*gW?`gXlv-SxQ=(rElr7IJ$w&jLEY?S;XJiln>Cn$f%uCnzPs&P7E&-a($iM`& O4g?q(n1Lh{0}B8K5hD}; literal 0 HcmV?d00001 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 548a2a8..6807a2b 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,8 +2,6 @@ - - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.java - + diff --git a/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java b/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java new file mode 100644 index 0000000..bcb872c --- /dev/null +++ b/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class AbstractModel { + +} diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java similarity index 64% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index 7038ad8..3d07d43 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java similarity index 63% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java index 02fcf81..c3282f9 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java similarity index 55% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java index 65e46d9..d779290 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java similarity index 64% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java index cf212ba..96321a4 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java similarity index 53% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java index b94b278..0035d02 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java b/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java similarity index 54% rename from result/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java rename to src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java index db8ead1..c5037cd 100644 --- a/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java +++ b/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java @@ -1,4 +1,4 @@ -package ru.caf82.result.machinelearning.preprocessing; +package main.java.ru.caf82.result.machinelearning.preprocessing; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/workwithfiles/FileReader.java b/src/main/java/ru/caf82/result/workwithfiles/FileReader.java similarity index 65% rename from result/src/main/java/ru/caf82/result/workwithfiles/FileReader.java rename to src/main/java/ru/caf82/result/workwithfiles/FileReader.java index 993dc1d..077cfdd 100644 --- a/result/src/main/java/ru/caf82/result/workwithfiles/FileReader.java +++ b/src/main/java/ru/caf82/result/workwithfiles/FileReader.java @@ -1,4 +1,4 @@ -package ru.caf82.result.workwithfiles; +package main.java.ru.caf82.result.workwithfiles; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java b/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java similarity index 60% rename from result/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java rename to src/main/java/ru/caf82/result/workwithfiles/FileWorker.java index 9fe4f42..f7d8769 100644 --- a/result/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java +++ b/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java @@ -1,4 +1,4 @@ -package ru.caf82.result.workwithfiles; +package main.java.ru.caf82.result.workwithfiles; /** * Created by ilysko on 03.08.17. diff --git a/result/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java b/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java similarity index 65% rename from result/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java rename to src/main/java/ru/caf82/result/workwithfiles/FileWriter.java index 3de089c..373fcf5 100644 --- a/result/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java +++ b/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java @@ -1,4 +1,4 @@ -package ru.caf82.result.workwithfiles; +package main.java.ru.caf82.result.workwithfiles; /** * Created by ilysko on 03.08.17. From 84068f1b280b53249f2613c5f95b22ea9d7470d9 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Wed, 27 Sep 2017 23:25:35 +0300 Subject: [PATCH 14/40] new commit --- .../ru/caf82/result/machinelearning/models/AbstractModel.java | 0 .../result/machinelearning/preprocessing/CountVectorizer.java | 0 .../caf82/result/machinelearning/preprocessing/PorterStemmer.java | 0 .../result/machinelearning/preprocessing/SequenceProcessor.java | 0 .../result/machinelearning/preprocessing/TfidfVectorizer.java | 0 .../caf82/result/machinelearning/preprocessing/Transformer.java | 0 .../caf82/result/machinelearning/preprocessing/WordProcessor.java | 0 .../src}/main/java/ru/caf82/result/workwithfiles/FileReader.java | 0 .../src}/main/java/ru/caf82/result/workwithfiles/FileWorker.java | 0 .../src}/main/java/ru/caf82/result/workwithfiles/FileWriter.java | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java (100%) rename {src => result/src}/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java (100%) rename {src => result/src}/main/java/ru/caf82/result/workwithfiles/FileReader.java (100%) rename {src => result/src}/main/java/ru/caf82/result/workwithfiles/FileWorker.java (100%) rename {src => result/src}/main/java/ru/caf82/result/workwithfiles/FileWriter.java (100%) diff --git a/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java b/result/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java rename to result/src/main/java/ru/caf82/result/machinelearning/models/AbstractModel.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/Transformer.java diff --git a/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java b/result/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java similarity index 100% rename from src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java rename to result/src/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java diff --git a/src/main/java/ru/caf82/result/workwithfiles/FileReader.java b/result/src/main/java/ru/caf82/result/workwithfiles/FileReader.java similarity index 100% rename from src/main/java/ru/caf82/result/workwithfiles/FileReader.java rename to result/src/main/java/ru/caf82/result/workwithfiles/FileReader.java diff --git a/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java b/result/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java similarity index 100% rename from src/main/java/ru/caf82/result/workwithfiles/FileWorker.java rename to result/src/main/java/ru/caf82/result/workwithfiles/FileWorker.java diff --git a/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java b/result/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java similarity index 100% rename from src/main/java/ru/caf82/result/workwithfiles/FileWriter.java rename to result/src/main/java/ru/caf82/result/workwithfiles/FileWriter.java From 7020d5d559d886457ae38b5a15dc9064ff4d6b5a Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Thu, 28 Sep 2017 00:18:18 +0300 Subject: [PATCH 15/40] new commit --- .../result/exceptions/EmptyArrayException.class | Bin 0 -> 829 bytes .../InconveninentShapeException.class | Bin 0 -> 853 bytes .../machinelearning/models/AbstractModel.class | Bin 362 -> 362 bytes .../machinelearning/models/Boosting.class | Bin 0 -> 393 bytes .../machinelearning/models/KNeighbourhood.class | Bin 0 -> 365 bytes .../machinelearning/models/LinearKernel.class | Bin 0 -> 406 bytes .../models/LogisticRegression.class | Bin 0 -> 423 bytes .../machinelearning/models/NaiveBayes.class | Bin 0 -> 399 bytes .../machinelearning/models/NormalKernel.class | Bin 0 -> 406 bytes .../preprocessing/CountVectorizer.class | Bin 538 -> 538 bytes .../preprocessing/PorterStemmer.class | Bin 528 -> 528 bytes ...dfVectorizer.class => TfldfVectorizer.class} | Bin 538 -> 538 bytes .../main/java/ru/caf82/result/others/Dao.class | Bin 0 -> 120 bytes .../caf82/result/others/DaoImplementation.class | Bin 0 -> 342 bytes .../ru/caf82/result/others/MathService.class | Bin 0 -> 1670 bytes .../others/ModelSelectionHibernateEntity.class | Bin 0 -> 378 bytes .../result/others/ReviewHibernateEntity.class | Bin 0 -> 354 bytes .../ru/caf82/result/others/SwingModel.class | Bin 0 -> 321 bytes .../ru/caf82/result/others/SwingTraining.class | Bin 0 -> 330 bytes .../caf82/result/workwithfiles/FileReader.class | Bin 393 -> 393 bytes .../caf82/result/workwithfiles/FileWriter.class | Bin 393 -> 393 bytes nbproject/private/private.xml | 5 ++++- 22 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 build/classes/main/java/ru/caf82/result/exceptions/EmptyArrayException.class create mode 100644 build/classes/main/java/ru/caf82/result/exceptions/InconveninentShapeException.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/Boosting.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/KNeighbourhood.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/LogisticRegression.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/NaiveBayes.class create mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class rename build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/{TfidfVectorizer.class => TfldfVectorizer.class} (66%) create mode 100644 build/classes/main/java/ru/caf82/result/others/Dao.class create mode 100644 build/classes/main/java/ru/caf82/result/others/DaoImplementation.class create mode 100644 build/classes/main/java/ru/caf82/result/others/MathService.class create mode 100644 build/classes/main/java/ru/caf82/result/others/ModelSelectionHibernateEntity.class create mode 100644 build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class create mode 100644 build/classes/main/java/ru/caf82/result/others/SwingModel.class create mode 100644 build/classes/main/java/ru/caf82/result/others/SwingTraining.class diff --git a/build/classes/main/java/ru/caf82/result/exceptions/EmptyArrayException.class b/build/classes/main/java/ru/caf82/result/exceptions/EmptyArrayException.class new file mode 100644 index 0000000000000000000000000000000000000000..d8d86dadeb25f414dcd351ed3b1388cb1a9e977a GIT binary patch literal 829 zcmbV}Pfy!G5XIl-4=KhakTfBHXz2|?RZDFT2oO?L!71tmgw*5WZo{I)Mr*q*AFBsc zsfT`meyEB!j!E1KF38fXcW37J-e~^({q-BbJFI)CqdSipRwVQqSZ!cUp)oc|qK8JI zHMrDYbuiM=FgQt_jfVRQ^-yOClburX^uop8^!dmzKX+gwn;t4ux3P~dT>M`zkuxfhSM^ui_zdxNpIQIM;o7T-QR zEclp1!^acME9^dYB!%{D4bwsKk~^z&krjSa$^R(Cvj!#Nj6QE~c`Bau{!geMdD&A& zk8Qv*i`!V_pFb%=6HB}aV3|<>$GHSM1km5PL1ji+M3ogCQo590$w}Ru>=h(Y5_@98 zL+c@C^?&9nnQLUOKfshxC(L%i{6t-G)13P3zq&yQ+#(X#V0_Nz7X)wS@Xblv)Nr#f POq8sSScPZote|rXe{h@d literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/exceptions/InconveninentShapeException.class b/build/classes/main/java/ru/caf82/result/exceptions/InconveninentShapeException.class new file mode 100644 index 0000000000000000000000000000000000000000..2e236859fa567ff0a36c51bb672013afe01e16c1 GIT binary patch literal 853 zcmbu6TTc^F6ouEJEtPSkQfw`Fp}s*iP69rdK#0LeLeltBLgM3LIJU>MXUJU8zvTll z;ej9Ek20=39ooSJUd$x>T=w4IT6@m#KUdcP-r<>t8rn;!;;DpA9cy*0E7T_@N%YVt zH2dH5g$~Br4TC`%TQ}TQsD(O9m~54j$D=sQxhLcp}?b1k56=L4=(~(US4*C;qU68BCSrF>4@3({4B-uC(%#YBVr#5m) zaOA?sT^L8SO9vx;Za&>4X{5DTa#+|GN1gKh+_|KB8Fk8BEtp@ZD{dMypS?GiD1n diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/Boosting.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/Boosting.class new file mode 100644 index 0000000000000000000000000000000000000000..77086cf57e8deeb06bd9f879ca4ce721e0e786ea GIT binary patch literal 393 zcmbVI%Sr?>5Uie^hmNzZ_y^w9g8}iNtSqSDY4oD(JrkoF$xI;0_+Op`4}O3jC3Y75 z0PR3^s+z8D`t$4k1HcJ(YD_S#uw7wBD9_Dc;({>QKUfm-EBBxYv(^mycI-Rt?`3CM z*=?PYb}79{{71~=$^^o^?WGySvwV@lk3z}E(_`Uv7;O~2R4ewfTKd5ZPoigk8^on^ zAu^v6>N_`jrLRpIGyN?bCAS7S3c}gH?FoxN_g-`%da2?~+7x@p_*^N7AFsn$G81bK e6o+r1R~9l~A|U zUud(gD>wMsxz#lxf9784M-#%1{*TXtbAcEM;cm+)!ff2rN?zuv+Gy3s$B6hOp@<*H kFs97J$bsbS1N6>9gp4s|87QzbV(1g>BIlp5#~7jb1uW8Ax&QzG literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class new file mode 100644 index 0000000000000000000000000000000000000000..14106cd2c4af8eeceb2486409c7e63ba59ca089d GIT binary patch literal 406 zcmbtQyH3O~5S-2B0U>a}AJ72>mJkIJa1=;17hMCoev>m7Bgc`Pg#V&KqTmDgD8%|i zL5uK8$??gO5Z`qxO_-L(>BZPq+COq- zML8_Hn(dOk3H(QlhsN}T+p=Zj)HA=Z@}sKx>GE88-H&!qE!T~BSLzlUeRwLpx7aPzMDtO(o%)u3O;**8gQCSoj0{QR2&C zXC;`xyf?#R<|UtB?;ilpuv=n+?E*UmriA>`SQBQ1$>GtGkS>NtO_f5nzw0n?E z$I4zkDA_HgGm-y@X;>LgxTQ1*j=*?g+2<81SI;F2o4BY=cauO3Nq{s-1e~2W^{_HYud~i~QoA?eKAmPu9 ohxqbhj5#y0=0JA*26|;7LBW`_3{==yW9&0*qU1{0VoXqd0}g6(!~g&Q literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/NaiveBayes.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/NaiveBayes.class new file mode 100644 index 0000000000000000000000000000000000000000..6a7a573f1385d985cb9fd7bdf955fdcbaa12e10e GIT binary patch literal 399 zcmbtQ%Sr?>5Uie^hmNBo{((33U_d+ws|zZ48uy~?y=RPWWFC-Y7W^zvf(Jjqj}kkJ z;8{$dI#o?qHTnE{{{V1`-5e8aXV}S564G- im|AlnIeG)ViVz_aOhpC?Y^*W76Ko=vO4t&NP<#W8YG_0N literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class new file mode 100644 index 0000000000000000000000000000000000000000..0fc1dfed2d39cfe61425fafb231c3f8d0e977dd6 GIT binary patch literal 406 zcmbtQyH3O~5FF?7fDpKYKcE8&EFlUc;3$x;xhM_j`c2MUjOKf@JhZwOxGOE`PCnBMNk7Vlo~|yWSN&)PX{l-1%P8`l?l#i0zv*S= zyd|?#o=4XL`GXsMqZT@>I{ZC653U7bBm%epTEjX2{C-&}y=iL>*E+YxF(UrEa0C}; kVoaIIEeDdbH;7jjB4msy%RqshErve9E^@vF_821+-?7YVX8-^I literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index f36b2fe02dcb171131921cc9ccad4370d2a7947c..bf2c51bb04d68eaea3ea3ea44dc770b4c78f59a3 100644 GIT binary patch delta 13 UcmbQmGK*!yUq(ir$^RH-03w diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class index ca822617f5bba48b9938dc53395a55cdf3ebb6cd..a5210f680f2b49d002f5260ad49b0a5c568963f5 100644 GIT binary patch delta 37 ncmbQhGJ$2oXGU2b1}+8$1|9}RAj!(W4P-F@*}OoKiGdFQXY&I` delta 37 ncmbQhGJ$2oXGU2z1}+8$1|9}RAj!(W4P-F@*}OoKiGdFQXGH@+ diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class similarity index 66% rename from build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfidfVectorizer.class rename to build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class index b6253c2175102981354ddf7739b8d5b3999c5260..8b3be7dec16a6c768aa37132ef5dd11dfe16ebf3 100644 GIT binary patch delta 28 jcmbQmGK*!xT*jP<^W=fVzF@|j$wG{;8F?oEW0U~^lt&5e delta 28 jcmbQmGK*!xT*l0a^W=fVzF@}8$wG{;8QCWPW0U~^lbH$L diff --git a/build/classes/main/java/ru/caf82/result/others/Dao.class b/build/classes/main/java/ru/caf82/result/others/Dao.class new file mode 100644 index 0000000000000000000000000000000000000000..2e83732ff09a10ca7c51c1666386c75cd6cc9de2 GIT binary patch literal 120 zcmX^0Z`VEs1_l!bc6J6(~GCowNw-#;lUHMs<6BqIY8&<+q_ LWMBr8Objdl@Aw_% literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/DaoImplementation.class b/build/classes/main/java/ru/caf82/result/others/DaoImplementation.class new file mode 100644 index 0000000000000000000000000000000000000000..6dd6a8607128cfe428d167f9634dfddfa897e5e1 GIT binary patch literal 342 zcmb79Jxjzu5Pg%&hsNj~7WQ^(;lgo+pxB%ULeN6FeiK)3kIk-ZHvTUw!NMQlj}m8t zos~22X5M3XGxPQR@d;poS&0dD3+xq`67maeb+{x{y{c| zmHpba(yXM{k^hQmSnHm!s5_~x*vMBY{2*HSbT$`W^@9n*g|+g%xRUOsdoik0Hprlz zJtvg+Zt$(T*3tjq&%|l;tB@ii%>TcDFdGjt(msp3W~17GLnQor4B}*G#+;cLIgp*a bgWgz3P%!2!0~NMLjD3b}lw1irj0vhAPjXV< literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/MathService.class b/build/classes/main/java/ru/caf82/result/others/MathService.class new file mode 100644 index 0000000000000000000000000000000000000000..b363daea49631db9a9a23d412a1cacf7c69c3458 GIT binary patch literal 1670 zcma)6O-~zF6g|(L4>K_)AxwY(1wxAL0b)#u3keWtNd$z@sLrXNow+X4A)NxhEH34nPD|_LLKs=MZ zBcOcXZ@2<2%U;=Csg~B=;1hejNKNaq@7TpVcHqhTkx~h_ylsI?%O%?@=kD7(b}p#q z9Q)qHST1n4tHm(qhg)v2ox5#^TdQuc<2f#q8XJE2QQ&V>olro}tj({@XXgck$F<01 z3&hr>Vx0gRfq0>!c{Q}12e<9Y5dh=Hp5s zKUndDl3nyZx1~J;GjCRA(cPk3a?28mz2gSbxZRNa8fk2u!@4AosX}+>KHtd^i^b_QT_{1ZMx2>tfmQ%R6qFZ7YYX zTXw}g4xwWziD?WZ(TqSg&T^MVphFw? zWWxX^&hgeH3!;^D{)Kib<(yUj8i}F$H#qe(Vt1b+{>-Wm)xVWjg;(`iYB63=OvS1n zz|2^tk{{xF;4JPd;`_rFnI9M=9wi=R0x+$?bgfL($)_J(7(h2h(1S_J>*$SuS$y*b zBa8Dq5eDtLDdnk$Cqb`w`1BHPAGOU;4L$WYl(_hdq5G-Q_>;obBs)Y0S=D%?<-6O` zGPqlV=J*ocNnQp{@M7R16G&bz9P=_w>zLG8LpA6%B;E{=jsl!(7%@Ntbrar=P`?h0 zvqC!p6D0yO81}LCI@8K`Y~PdAg0(VIFDUVXYO1DkfVL4+%};9S4$WEESIP75X{-Lo zUq~%kSJh6nUeMwN-PBF(06m?msplsX*^Wedvkgr(oN|`-b^834wd%^oBY!ChEBn`B znJT~e^k%k(r2lag`nmOlz#1)FidY=xWQ>sVQMNVDW?tspT%o3bG0F)(Gq}dLVH$UN zx<^^$EyVly0`vHi@+;hoXqsW!BaD_I&l;_pqf-LAB&!qWqX~R`L}EL=v$PY8^(kd9 zG4&DI7!u9;A=y)PSaB{PfIrcGNUWMvz0&o)gu(gfisnOMBsm>J7;ZEHThY7#o$;wI zNk^;IWp$0!_$Rq9$k!hyh-i(b@)i5Uk$Yhpwx4_y-!PfdgV7D93>)2CD`qm(Q-FH^2>74Vj7mZBh2cx)K;wIixj>Wt$aE=5ngq@3BrY?@}0QlwPvo2YJ+z6 zM)P7TgSxUohu3pLId{Ep)wPaZ`+rU!N1qBQGQ#wK#)Qdmw2}5%+&3$}4tq%WKQV}t lT^Ms_V&Fh_^bUGsAwj{IvkX+&7%=u3Hc@gVY%wONegG=VVP^mU literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class b/build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..08e9f85cfe52e21f75a43ccb7221b5eb6060385b GIT binary patch literal 354 zcmbVIJxjzu5Pg%&hsNj~mUeb(;ev=9C^n*41O=7rH*xjm$ZcS=Iq_#%2^RhUf0Q^I zEUlb@H}f9Dn_<4bKRy8*W0GTp%?w)^#)R~YE&FrAXm5W;h%eelLl~EA%}u|ojC;^k zBg%H!*1DN#$ASNfv7d8Cn3hY;RxR{OE7z-9KTVI6GhN?!)%v+{ow_qCHZRvKhE{uX zX+8VbQ$l{<_O3Qp9CqydIdvF(3&cnWC;wYSm<-1?+CHn>YGG=RT}1MS5F{z?f~hby fa3DE&2fc|9ArnkR1`4bV82SY3$fXiC1S1qbCZbp1 literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/SwingModel.class b/build/classes/main/java/ru/caf82/result/others/SwingModel.class new file mode 100644 index 0000000000000000000000000000000000000000..a64d810743976e032fe72c0b5fe5152366c5f404 GIT binary patch literal 321 zcmb7<&q~8U5XQer^QXpWif_=HR&+r;2ud%4r>KWY@0)aOw`@1C+30h55Y?A&%00>2 zaB@_&jWkQ?bnw4n>^Hh2oK-uit=P&JDO@ia`FwRDoa%bxMe8@pbzl4m0x=T8=|7N!$?&(4b}b(3t!g}`i1^G<#LY<7l${tnkj&meZyZF( WSW}LH0^>o$oL~<*zl43(2*nS!x=JSi literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/SwingTraining.class b/build/classes/main/java/ru/caf82/result/others/SwingTraining.class new file mode 100644 index 0000000000000000000000000000000000000000..dfc2178d425167bcf25304d13208f6097f4d5ae3 GIT binary patch literal 330 zcmb79yKcfj5S%rBB#sG)KcEXKxF|{y2}FaG%7Ow!e>N95WX{t0oP1ZRNECcPJ}S!E zqM^*LG`lmq8twl4p3VSX(2vnUH^O~{9wD4+quq?qc^GX7{=D2OLNC=uE$U;Y>{@08 zD}%JmWwDV~H~b>{Zm%oCQ+kxzh=cr)!qy^}@2}6os;VxWDBWJ!N~}J$*{vgG&`}(4k~vT!sCCNAWn8=44H|R1Ht1r=!*pp X5o5?Qkl?1prVnt7m@DCq(L?eF+ci!R literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class b/build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class index e409b767eeadb3d6fb9b30491192f292662f7005..173f582d5ce7515818865e57cbff0b8e5708c1fa 100644 GIT binary patch delta 13 UcmeBV?quGO!^p@pIhRoe02;9aU;qFB delta 13 UcmeBV?quGO!^p@sIhRoe02-46S^xk5 diff --git a/build/classes/main/java/ru/caf82/result/workwithfiles/FileWriter.class b/build/classes/main/java/ru/caf82/result/workwithfiles/FileWriter.class index 557842783f4cfc3a024bc56c0f56ab3638790a8e..680ec2b671e7c3e6f217b2cc5eaae45c00cf2f63 100644 GIT binary patch delta 13 UcmeBV?quGO!^p@pIhRoe02;9aU;qFB delta 13 UcmeBV?quGO!^p@sIhRoe02-46S^xk5 diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6807a2b..19a50af 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,6 +2,9 @@ - + + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/main/java/ru/caf82/result/exceptions/EmptyArrayException.java + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/main/java/ru/caf82/result/others/MathService.java + From b87d851e100bed804441e084faed2bdac746f860 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Thu, 28 Sep 2017 17:56:44 +0300 Subject: [PATCH 16/40] add result --- .../exceptions/EmptyArrayException.java | 33 ++++++++ .../InconveninentShapeException.java | 32 ++++++++ .../machinelearning/models/AbstractModel.java | 14 ++++ .../machinelearning/models/Boosting.java | 13 +++ .../models/KNeighbourhood.java | 14 ++++ .../machinelearning/models/LinearKernel.java | 14 ++++ .../models/LogisticRegression.java | 14 ++++ .../machinelearning/models/NaiveBayes.java | 14 ++++ .../machinelearning/models/NormalKernel.java | 14 ++++ .../preprocessing/CountVectorizer.java | 14 ++++ .../preprocessing/PorterStemmer.java | 14 ++++ .../preprocessing/SequenceProcessor.java | 14 ++++ .../preprocessing/TfldfVectorizer.java | 14 ++++ .../preprocessing/Transformer.java | 14 ++++ .../preprocessing/WordProcessor.java | 14 ++++ src/ru/caf82/result/others/Dao.java | 14 ++++ .../result/others/DaoImplementation.java | 14 ++++ src/ru/caf82/result/others/MathService.java | 80 +++++++++++++++++++ .../others/ModelSelectionHibernateEntity.java | 14 ++++ .../result/others/ReviewHibernateEntity.java | 14 ++++ src/ru/caf82/result/others/SwingModel.java | 14 ++++ src/ru/caf82/result/others/SwingTraining.java | 14 ++++ .../result/workwithfiles/FileReader.java | 14 ++++ .../result/workwithfiles/FileWorker.java | 14 ++++ .../result/workwithfiles/FileWriter.java | 14 ++++ 25 files changed, 452 insertions(+) create mode 100644 src/ru/caf82/result/exceptions/EmptyArrayException.java create mode 100644 src/ru/caf82/result/exceptions/InconveninentShapeException.java create mode 100644 src/ru/caf82/result/machinelearning/models/AbstractModel.java create mode 100644 src/ru/caf82/result/machinelearning/models/Boosting.java create mode 100644 src/ru/caf82/result/machinelearning/models/KNeighbourhood.java create mode 100644 src/ru/caf82/result/machinelearning/models/LinearKernel.java create mode 100644 src/ru/caf82/result/machinelearning/models/LogisticRegression.java create mode 100644 src/ru/caf82/result/machinelearning/models/NaiveBayes.java create mode 100644 src/ru/caf82/result/machinelearning/models/NormalKernel.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/Transformer.java create mode 100644 src/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java create mode 100644 src/ru/caf82/result/others/Dao.java create mode 100644 src/ru/caf82/result/others/DaoImplementation.java create mode 100644 src/ru/caf82/result/others/MathService.java create mode 100644 src/ru/caf82/result/others/ModelSelectionHibernateEntity.java create mode 100644 src/ru/caf82/result/others/ReviewHibernateEntity.java create mode 100644 src/ru/caf82/result/others/SwingModel.java create mode 100644 src/ru/caf82/result/others/SwingTraining.java create mode 100644 src/ru/caf82/result/workwithfiles/FileReader.java create mode 100644 src/ru/caf82/result/workwithfiles/FileWorker.java create mode 100644 src/ru/caf82/result/workwithfiles/FileWriter.java diff --git a/src/ru/caf82/result/exceptions/EmptyArrayException.java b/src/ru/caf82/result/exceptions/EmptyArrayException.java new file mode 100644 index 0000000..50faf84 --- /dev/null +++ b/src/ru/caf82/result/exceptions/EmptyArrayException.java @@ -0,0 +1,33 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.exceptions; + +/** + * + * @author 1 + */ +public class EmptyArrayException extends Exception { + + private String message; + private Throwable cause; + + public EmptyArrayException () { + + } + + public EmptyArrayException (String message) { + this.message = message; + } + + public EmptyArrayException (Throwable cause) { + this.cause = cause; + } + + public EmptyArrayException (String message, Throwable cause) { + this.message = message; + this.cause = cause; + } +} diff --git a/src/ru/caf82/result/exceptions/InconveninentShapeException.java b/src/ru/caf82/result/exceptions/InconveninentShapeException.java new file mode 100644 index 0000000..7631119 --- /dev/null +++ b/src/ru/caf82/result/exceptions/InconveninentShapeException.java @@ -0,0 +1,32 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.exceptions; + +/** + * + * @author 1 + */ +public class InconveninentShapeException extends Exception{ + + private String message; + private Throwable cause; + public InconveninentShapeException () { + + } + + public InconveninentShapeException (String message) { + this.message = message; + } + + public InconveninentShapeException (Throwable cause) { + this.cause = cause; + } + + public InconveninentShapeException (String message, Throwable cause) { + this.message = message; + this.cause = cause; + } +} diff --git a/src/ru/caf82/result/machinelearning/models/AbstractModel.java b/src/ru/caf82/result/machinelearning/models/AbstractModel.java new file mode 100644 index 0000000..58dc7ad --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/AbstractModel.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public abstract class AbstractModel { + +} diff --git a/src/ru/caf82/result/machinelearning/models/Boosting.java b/src/ru/caf82/result/machinelearning/models/Boosting.java new file mode 100644 index 0000000..cb5584b --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/Boosting.java @@ -0,0 +1,13 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class Boosting extends AbstractModel { +} diff --git a/src/ru/caf82/result/machinelearning/models/KNeighbourhood.java b/src/ru/caf82/result/machinelearning/models/KNeighbourhood.java new file mode 100644 index 0000000..cd1ff40 --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/KNeighbourhood.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public abstract class KNeighbourhood { + +} diff --git a/src/ru/caf82/result/machinelearning/models/LinearKernel.java b/src/ru/caf82/result/machinelearning/models/LinearKernel.java new file mode 100644 index 0000000..1b275da --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/LinearKernel.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class LinearKernel extends KNeighbourhood{ + +} diff --git a/src/ru/caf82/result/machinelearning/models/LogisticRegression.java b/src/ru/caf82/result/machinelearning/models/LogisticRegression.java new file mode 100644 index 0000000..d0f3f21 --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/LogisticRegression.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class LogisticRegression extends AbstractModel { + +} diff --git a/src/ru/caf82/result/machinelearning/models/NaiveBayes.java b/src/ru/caf82/result/machinelearning/models/NaiveBayes.java new file mode 100644 index 0000000..18ab0ff --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/NaiveBayes.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class NaiveBayes extends AbstractModel { + +} diff --git a/src/ru/caf82/result/machinelearning/models/NormalKernel.java b/src/ru/caf82/result/machinelearning/models/NormalKernel.java new file mode 100644 index 0000000..2e4247a --- /dev/null +++ b/src/ru/caf82/result/machinelearning/models/NormalKernel.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.models; + +/** + * + * @author 1 + */ +public class NormalKernel extends KNeighbourhood{ + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java new file mode 100644 index 0000000..8c2332c --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public class CountVectorizer implements SequenceProcessor, Transformer{ + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java b/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java new file mode 100644 index 0000000..58db9c4 --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public class PorterStemmer implements Transformer, WordProcessor { + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java b/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java new file mode 100644 index 0000000..85b21ff --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public interface SequenceProcessor { + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java new file mode 100644 index 0000000..7c46020 --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public class TfldfVectorizer implements SequenceProcessor, Transformer { + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/Transformer.java b/src/ru/caf82/result/machinelearning/preprocessing/Transformer.java new file mode 100644 index 0000000..b1bbaad --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/Transformer.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public interface Transformer { + +} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java b/src/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java new file mode 100644 index 0000000..2401b9d --- /dev/null +++ b/src/ru/caf82/result/machinelearning/preprocessing/WordProcessor.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.machinelearning.preprocessing; + +/** + * + * @author 1 + */ +public interface WordProcessor { + +} diff --git a/src/ru/caf82/result/others/Dao.java b/src/ru/caf82/result/others/Dao.java new file mode 100644 index 0000000..5a9d57a --- /dev/null +++ b/src/ru/caf82/result/others/Dao.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.others; + +/** + * + * @author 1 + */ +public interface Dao { + +} diff --git a/src/ru/caf82/result/others/DaoImplementation.java b/src/ru/caf82/result/others/DaoImplementation.java new file mode 100644 index 0000000..6cdba63 --- /dev/null +++ b/src/ru/caf82/result/others/DaoImplementation.java @@ -0,0 +1,14 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.others; + +/** + * + * @author 1 + */ +public class DaoImplementation { + +} diff --git a/src/ru/caf82/result/others/MathService.java b/src/ru/caf82/result/others/MathService.java new file mode 100644 index 0000000..5299ed5 --- /dev/null +++ b/src/ru/caf82/result/others/MathService.java @@ -0,0 +1,80 @@ +/* + * To change this license header, choose License Headers in Project Properties. + * To change this template file, choose Tools | Templates + * and open the template in the editor. + */ +package main.java.ru.caf82.result.others; + +import main.java.ru.caf82.result.exceptions.EmptyArrayException; +import main.java.ru.caf82.result.exceptions.InconveninentShapeException; + +/** + * + * @author 1 + */ +public class MathService { + + + public static double dotProduct(double[] a, double[] b) throws InconveninentShapeException, EmptyArrayException + { + if (a.length == 0 || b.length == 0) { + throw new EmptyArrayException(); + } + + if (a.length != b.length) { + throw new InconveninentShapeException(); + } + double result = 0; + for (int i=0;i Date: Thu, 28 Sep 2017 18:07:43 +0300 Subject: [PATCH 17/40] change files --- .../machinelearning/models/Boosting.class | Bin 393 -> 553 bytes .../machinelearning/models/LinearKernel.class | Bin 406 -> 0 bytes .../models/LogisticRegression.class | Bin 423 -> 583 bytes .../machinelearning/models/NaiveBayes.class | Bin 399 -> 559 bytes .../machinelearning/models/NormalKernel.class | Bin 406 -> 0 bytes .../preprocessing/CountVectorizer.class | Bin 538 -> 0 bytes .../preprocessing/TfldfVectorizer.class | Bin 538 -> 0 bytes .../preprocessing/WordProcessor.class | Bin 163 -> 0 bytes .../ModelSelectionHibernateEntity.class | Bin 378 -> 0 bytes .../result/others/ReviewHibernateEntity.class | Bin 354 -> 0 bytes .../caf82/result/others/SwingTraining.class | Bin 330 -> 0 bytes .../result/workwithfiles/FileReader.class | Bin 393 -> 0 bytes .../result/workwithfiles/FileWorker.class | Bin 141 -> 0 bytes .../result/workwithfiles/FileWriter.class | Bin 393 -> 0 bytes .../exceptions/EmptyArrayException.class | Bin 0 -> 809 bytes .../InconveninentShapeException.class | Bin 0 -> 833 bytes .../models/AbstractModel.class | Bin 0 -> 342 bytes .../machinelearning/models/Boosting.class | Bin 0 -> 363 bytes .../models/KNeighbourhood.class | Bin 0 -> 345 bytes .../machinelearning/models/LinearKernel.class | Bin 0 -> 376 bytes .../models/LogisticRegression.class | Bin 0 -> 393 bytes .../machinelearning/models/NaiveBayes.class | Bin 0 -> 369 bytes .../machinelearning/models/NormalKernel.class | Bin 0 -> 376 bytes .../preprocessing/CountVectorizer.class | Bin 0 -> 498 bytes .../preprocessing/PorterStemmer.class | Bin 488 -> 488 bytes .../preprocessing/TfldfVectorizer.class | Bin 0 -> 498 bytes .../preprocessing/Transformer.class | Bin 0 -> 149 bytes .../preprocessing/WordProcessor.class | Bin 0 -> 153 bytes .../classes/ru/caf82/result/others/Dao.class | Bin 0 -> 110 bytes .../result/others/DaoImplementation.class | Bin 0 -> 322 bytes .../ru/caf82/result/others/MathService.class | Bin 1670 -> 1630 bytes .../ModelSelectionHibernateEntity.class | Bin 0 -> 358 bytes .../result/others/ReviewHibernateEntity.class | Bin 0 -> 334 bytes .../ru/caf82/result/others/SwingModel.class | Bin 0 -> 301 bytes .../caf82/result/others/SwingTraining.class | Bin 0 -> 310 bytes .../result/workwithfiles/FileReader.class | Bin 0 -> 363 bytes .../result/workwithfiles/FileWriter.class | Bin 0 -> 363 bytes .../exceptions/EmptyArrayException.java | 2 +- .../InconveninentShapeException.java | 2 +- .../machinelearning/models/AbstractModel.java | 2 +- .../machinelearning/models/Boosting.java | 2 +- .../models/KNeighbourhood.java | 2 +- .../machinelearning/models/LinearKernel.java | 2 +- .../models/LogisticRegression.java | 2 +- .../machinelearning/models/NaiveBayes.java | 2 +- .../machinelearning/models/NormalKernel.java | 2 +- .../preprocessing/CountVectorizer.java | 2 +- .../preprocessing/PorterStemmer.java | 2 +- .../preprocessing/SequenceProcessor.java | 2 +- .../preprocessing/TfldfVectorizer.java | 2 +- .../preprocessing/Transformer.java | 2 +- .../preprocessing/WordProcessor.java | 2 +- src/ru/caf82/result/others/Dao.java | 2 +- .../result/others/DaoImplementation.java | 2 +- src/ru/caf82/result/others/MathService.java | 6 +++--- .../others/ModelSelectionHibernateEntity.java | 2 +- .../result/others/ReviewHibernateEntity.java | 2 +- src/ru/caf82/result/others/SwingModel.java | 2 +- src/ru/caf82/result/others/SwingTraining.java | 2 +- .../result/workwithfiles/FileReader.java | 2 +- .../result/workwithfiles/FileWorker.java | 2 +- .../result/workwithfiles/FileWriter.java | 2 +- 62 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class delete mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class delete mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class delete mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class delete mode 100644 build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class delete mode 100644 build/classes/main/java/ru/caf82/result/others/ModelSelectionHibernateEntity.class delete mode 100644 build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class delete mode 100644 build/classes/main/java/ru/caf82/result/others/SwingTraining.class delete mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class delete mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class delete mode 100644 build/classes/main/java/ru/caf82/result/workwithfiles/FileWriter.class create mode 100644 build/classes/ru/caf82/result/exceptions/EmptyArrayException.class create mode 100644 build/classes/ru/caf82/result/exceptions/InconveninentShapeException.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/AbstractModel.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/Boosting.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/KNeighbourhood.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/LinearKernel.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/LogisticRegression.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/NaiveBayes.class create mode 100644 build/classes/ru/caf82/result/machinelearning/models/NormalKernel.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/Transformer.class create mode 100644 build/classes/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class create mode 100644 build/classes/ru/caf82/result/others/Dao.class create mode 100644 build/classes/ru/caf82/result/others/DaoImplementation.class rename build/classes/{main/java => }/ru/caf82/result/others/MathService.class (67%) create mode 100644 build/classes/ru/caf82/result/others/ModelSelectionHibernateEntity.class create mode 100644 build/classes/ru/caf82/result/others/ReviewHibernateEntity.class create mode 100644 build/classes/ru/caf82/result/others/SwingModel.class create mode 100644 build/classes/ru/caf82/result/others/SwingTraining.class create mode 100644 build/classes/ru/caf82/result/workwithfiles/FileReader.class create mode 100644 build/classes/ru/caf82/result/workwithfiles/FileWriter.class diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/Boosting.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/Boosting.class index 77086cf57e8deeb06bd9f879ca4ce721e0e786ea..80317e4ade1d3434b28eb19d1969cdf74d5054dc 100644 GIT binary patch delta 360 zcmYjMJxc>Y5Ph3Va+fn|j7G)A)k+093mZQWEUZ)nMZt1!vk4pa_QKspv`S-RnabZ_ zX%$e=-XA57F%X-1^WMyx;XQdTMgH~u_5olQ%OOgb^HC2lAEJN-9}ORigT`YeIFv?P z?T!Y|t9>5go zG&asA;+4y^Z69pjV2x6hDIh2kqhkTp3bBZg5tg=wV6UTbNVPl?tC*s``nNzhO)S97 e*c<`t@JIr}cNA{x-Vnu4VhsOJFwBxxKff$?3=9k=3<6vX%nZEj41DYi{1X*gCa#xdW?^8RY|m)NXg4v#Fu^gY zxTGjCxx_a=B{hdZk%0-Q90VAF5U3DHvH^MeU_Ju_tJZb~#*IJ$CI)sO$p#c=VBlfk W0Fxj#D+4D37m#LT;0BUR3_Jij#}XL; diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/LinearKernel.class deleted file mode 100644 index 14106cd2c4af8eeceb2486409c7e63ba59ca089d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmbtQyH3O~5S-2B0U>a}AJ72>mJkIJa1=;17hMCoev>m7Bgc`Pg#V&KqTmDgD8%|i zL5uK8$??gO5Z`qxO_-L(>BZPq+COq- zML8_Hn(dOk3H(QlhsN}T+p=Zj)HA=Z@}sKx>GE88-H&!qE!T~BSLzlUeRwLpx7aPzMDtO(o%)u3O;UdU}ktNekGPq4DK z3MgnP_y_)sI7Trx^X9#oH^X~y-irMF^XUb^7FK^FA?1tWLk5#N9+% zhH&#}DxTTCGM%0J1=cB3nc{&0F*@Z@tq_X{8DXh0278>0eX8Y&7+{9_;AeqwmY9dR eKXY>f4oQIjjKXEj8Kd}0jN$(YhI!HosD1&Kt4kLE delta 146 zcmX@kvYc7;)W2Q(7#J8#7zDT&m>GE48Ti;4_$Mm#P28!@#=^kL$lyFN!Y5Ph4kyPT)S=&4w3tTYg=No7Q^uu>5e1C~=HpZ05~-GjE1>Uwka_kI&~<0Bx*$C}YV%-Nmwp0#+OZ4p#HvuIlbet&FmJ z`9ovuz-8Fzi)#^TVS3@|$XJ!c2RAYvSd|)v!*e6kWT3Q&bj-7KG?X!yX*cFAE`>3v zP5}{1^{WO1Xk888ff$?3=9k=3<6vX%nZEj41DYi{1X-0CT^5xV_{%rWU!u?Va?3QU^g+t zFu^gYxTGjCxx_a=B{hdZk%0-Q1q2v@5U3bPvH^MeU_Ju_tJZb~#*IJ$CI)sO$p#c= aVBlfk0Fxj#D+4D37m#LT;0BUR3_Jji)e?{Z diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class b/build/classes/main/java/ru/caf82/result/machinelearning/models/NormalKernel.class deleted file mode 100644 index 0fc1dfed2d39cfe61425fafb231c3f8d0e977dd6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmbtQyH3O~5FF?7fDpKYKcE8&EFlUc;3$x;xhM_j`c2MUjOKf@JhZwOxGOE`PCnBMNk7Vlo~|yWSN&)PX{l-1%P8`l?l#i0zv*S= zyd|?#o=4XL`GXsMqZT@>I{ZC653U7bBm%epTEjX2{C-&}y=iL>*E+YxF(UrEa0C}; kVoaIIEeDdbH;7jjB4msy%RqshErve9E^@vF_821+-?7YVX8-^I diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class deleted file mode 100644 index bf2c51bb04d68eaea3ea3ea44dc770b4c78f59a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmb_Z%}N6?7@TakU9HvD+86Mq9t?;FLGe;hgrY)A@7eg(rtBv5+g%U7l_$Z258y+I z-&Ri^iv)(ugv@+DpI`4E08TMzqk(RMUV_~O{RDdotqbQ}d8yDiIGifP!|*@~-I4Qj zTjeS7#H5)h{ZX(cn;LdC{}tnM?h1vQQEr^q3-fF=SK6A{*@XdzL!{-;cZ-m37-NIiGy zLW+@&)-@l~Q$^m={ZEg96^842P1yKi7C0xyJ|fv&gcwa(rII5<5Zn-^R~%>_y+OT- Z5MfiWB{I-KdxiDAi7nyv_ie!lJKr;5n!f-5 diff --git a/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class b/build/classes/main/java/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class deleted file mode 100644 index 8b3be7dec16a6c768aa37132ef5dd11dfe16ebf3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 538 zcmb_Z%Sr<=6g`&d7PX zE3+B##LQArdZS=XIyLMn{wvmth07IgN11V6FU_;jTxx5Qi!;rXmuaChV;AC;l40-s zqh2wsI9ST_icOMqo=nLWf!z!7r9x{QO15WlQ*bW a5h830Hbn;7XsxljH?SkT`o1d|VecE#5Uk$Yhpwx4_y-!PfdgV7D93>)2CD`qm(Q-FH^2>74Vj7mZBh2cx)K;wIixj>Wt$aE=5ngq@3BrY?@}0QlwPvo2YJ+z6 zM)P7TgSxUohu3pLId{Ep)wPaZ`+rU!N1qBQGQ#wK#)Qdmw2}5%+&3$}4tq%WKQV}t lT^Ms_V&Fh_^bUGsAwj{IvkX+&7%=u3Hc@gVY%wONegG=VVP^mU diff --git a/build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class b/build/classes/main/java/ru/caf82/result/others/ReviewHibernateEntity.class deleted file mode 100644 index 08e9f85cfe52e21f75a43ccb7221b5eb6060385b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 354 zcmbVIJxjzu5Pg%&hsNj~mUeb(;ev=9C^n*41O=7rH*xjm$ZcS=Iq_#%2^RhUf0Q^I zEUlb@H}f9Dn_<4bKRy8*W0GTp%?w)^#)R~YE&FrAXm5W;h%eelLl~EA%}u|ojC;^k zBg%H!*1DN#$ASNfv7d8Cn3hY;RxR{OE7z-9KTVI6GhN?!)%v+{ow_qCHZRvKhE{uX zX+8VbQ$l{<_O3Qp9CqydIdvF(3&cnWC;wYSm<-1?+CHn>YGG=RT}1MS5F{z?f~hby fa3DE&2fc|9ArnkR1`4bV82SY3$fXiC1S1qbCZbp1 diff --git a/build/classes/main/java/ru/caf82/result/others/SwingTraining.class b/build/classes/main/java/ru/caf82/result/others/SwingTraining.class deleted file mode 100644 index dfc2178d425167bcf25304d13208f6097f4d5ae3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 330 zcmb79yKcfj5S%rBB#sG)KcEXKxF|{y2}FaG%7Ow!e>N95WX{t0oP1ZRNECcPJ}S!E zqM^*LG`lmq8twl4p3VSX(2vnUH^O~{9wD4+quq?qc^GX7{=D2OLNC=uE$U;Y>{@08 zD}%JmWwDV~H~b>{Zm%oCQ+kxzh=cr)!qy^}@2}6os;VxWDBWJ!N~}J$*{vgG&`}(4k~vT!sCCNAWn8=44H|R1Ht1r=!*pp X5o5?Qkl?1prVnt7m@DCq(L?eF+ci!R diff --git a/build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class b/build/classes/main/java/ru/caf82/result/workwithfiles/FileReader.class deleted file mode 100644 index 173f582d5ce7515818865e57cbff0b8e5708c1fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmb7A!AiqG6r9&KO^wyo{((33;6mv^P`ng81qGG%yh&f})@=ftjr}f9g&zC>KT3QX z1kYt*c4yvWc9`#<{TF}#d^@mojR=Hl@jFsc6wq9*Z_r5iLwKSG1^&t4n zdcp3Nki3+&%Q#RKtPjY6tohp@p7c7z2GAH5lFz5**7-qK2)LUkIjSBme*a diff --git a/build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class b/build/classes/main/java/ru/caf82/result/workwithfiles/FileWorker.class deleted file mode 100644 index 2de56315de22ef745a1520d1940ddb1e6dcfd754..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmX^0Z`VEs1_l!bc6J6L(|rSs3XTr52awl<1cO)s<(KWTXN06zd~&GBOB&)#oJUrR)1AWu+#U V0PSI9U;cbjB!Ee-kZYs8KHeOUJ*L;@`VY5)D-+!?=p5z zI&2G~`6ot>^r)iDbkc6aZD@wZy0mT)tKms8l)UF~nttzpcnrUj3*wNUg+!j^f$a0cN^%v%3P(emdcMAV{lc>*PREI7zWHXF1W_1!$CGI? zdvC3t9sfRL+jg(uCpRnoyT$XBPf7KQsl22B`BUtiMyd79Ng&?4|L`!7w{qd&fr~ZN zT&!b5Veo$!QE086e0e<_@_(xQv=Rr|*@}416)0)R=yLaxv*KLs-#~rOWSfi*%YX*O zEo^b+E<~u~A$J03Fbd!#YrzTu^qLi-N0J(Q9F literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/exceptions/InconveninentShapeException.class b/build/classes/ru/caf82/result/exceptions/InconveninentShapeException.class new file mode 100644 index 0000000000000000000000000000000000000000..b1884881f93c7e4e5360c2ce441dd90418b9448e GIT binary patch literal 833 zcmbV}TT2^J6ouC@iP7oQ)Yznn_M&fTlnzu8LFr3rKnT7>ggzdpr^!fiM&_datv*Ph z5B&lDsN&j_F&PW?p$zPE*?WI$?KyXUe*FfphYbf6G?!7vD+#SC+EuJ8R3|2m_0TBP z`xp93dt+^f-XMtrJ3LgV_&SZ5Y!s5GqbR)A=VQbC;!$9ORLar z<|Lh*o9I*u1s?i(e5Rv7&iQ3I83nPzK|e}8Uw=RN=tU+@$BAcdd~=xup^d#`>xcHr zSORS_80ky%t&OT;NBIY)2WcWhjwmba~q4s<>9VKcRkPWzQKM zwgE3#T*nG`?z9Ls-hq1utBeBZWfJTVKzI8V3v^Yi7o@}}!uP&Mm~5S(G(*ycsmLUo;5R9*0_!*Z}! zg#4lHy*77tZ20qgw&hnY5F;VX|AQyY2841f{rA<@=nx+vlHG?PIl>lA#i`K)$>}@j aO@auSXeu#KU}x0fonRNa+=M;R2*nR<(^CKd literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/models/Boosting.class b/build/classes/ru/caf82/result/machinelearning/models/Boosting.class new file mode 100644 index 0000000000000000000000000000000000000000..ccd3ed8b37f6fbc7b4018298f8c1543587a267b3 GIT binary patch literal 363 zcmb7A%Sr?>5Uie^hmNzZ_y^w9gF)GYpa`qrY4oD(JrkoF$xI;0_+Op`4}O3jC3Y6Q zYZ|J%s_E(`pI`4E0Or`KF~PLLc7++CJU4@h7lg_F!IF?)xd%;{wPw(_W8Z0iFFVW1 zZtIk^OX*GGKVlwNCJ>HWKMExuPfvu`VYE^7Qmxp*YUu|vJc*uNZ4j5vg~$|Kr4>3(-pzZ_-uRL&hJH9&zw$#*&#>bD%hU1HH14 Yp<*mq1{!RvG1Ub&QFA72F=lAK0pLShO8@`> literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/models/KNeighbourhood.class b/build/classes/ru/caf82/result/machinelearning/models/KNeighbourhood.class new file mode 100644 index 0000000000000000000000000000000000000000..7943a6ce5c8b2e29de350e231146175608eba3d1 GIT binary patch literal 345 zcmbVHO-sW-5Pg&8!^UWf{sM36p$noYC|(3FhI&wX-)y(dmQ5BmiT}%!(1Sm~A0^Hf zFJ7I2H}l@Wo0+fg?I(asOmmEIkl`@Hgpl5u*7Wy;(dpTO5I?x3CQM4x>iN)A+P})m zvT{^9CGA3b6Zo$f_qFK=*QFnXlB=5w;dM9IUNlnG>|nL@t!dYyVOQIUr@1!kx^jcB zom<`#@)z!vel%gl@!#=mBj03!7zyF(UkeD+;32H!6P~M$R(*Veh~E!EoNUgRG7~!v eBne^;8vI-OT6L`v-ta?B|$ZH^W|rDIuMi&J4GN$??gO5Z}3#CQM7y>BZPq+COq- zML8^8&34J&1pXt&Lt}cvRq01n^V9XY^12`GpjxgQNwAuIXS%g&CDrySq_UrDFV+nq ze{iF(^}PuL4t|?w&-}s#VkCr%e}v0Uf9#qsv{^TmEYdi)!Vx0*op4C5%oj|BsSO8` d(>Kto2oW;DRAivQ)&|2n!8UTKgdM>M#WyzkU@!mx literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/models/LogisticRegression.class b/build/classes/ru/caf82/result/machinelearning/models/LogisticRegression.class new file mode 100644 index 0000000000000000000000000000000000000000..3a88880ddbb31b79cb3c444e4ce17de88fcb554b GIT binary patch literal 393 zcmbVIJxjzu5Pg%&hsNlMjkTRxxFA<3CkG-}MGKYdH|v^PNj9*%@qbwf7XAQ#lsJ3X z*@!dnX5M4In9r~G4*)almY86>z)pcFA-^!zgau)8c(f#>SHq(wOlxEH?btWkJ;16RN*Gxi~}V6u4u&0M=<8h h#F_)y@f+xsg#-m-&N5J8V~sJ-u!)i*VT&((PefirueC8z=h>;ME{%uT{{&D8A_JdW7catIHsqr0y^|d`Ba;kF693DS;K2{@qr}eQ z!J{|>)l*e;bu*t|?;ilJFiSDPeu9GpQ$jp9t?BOwlatdGA-s2MO_=7U)y2@1+COq> zMLEh{#dgKsjQmFo``UDb>)a2j;-{Mn<#jjMUNv0Rl3+Fa*0dYdNUH5r;e5k(sl8aY zg!I7;zS0Xb4mkX6oiOJN>b1S!lDVOIf6LZjECE@;l=pxiVic7N)iw fh|bg(;JZuX3 VA_F~iSJ?C&Yzc3^Zwq?Z`36eAi?{#) literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/Transformer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/Transformer.class new file mode 100644 index 0000000000000000000000000000000000000000..c456de6a95bf742a8faecc8db23e31c3ca545e22 GIT binary patch literal 149 zcmYk0Jr2S!6oZ}e6R8s?ArfMs7hq*57kEUkkSa~8mxjYJZ~zX4NH#oJvWL(9d|z(> zM`(?W##W*2V;0M2=UHKQ6$)vHGO_GOdXhpX*;pD*2P2%aU(7`I;R1Um2`=2tEIdoJ foKj7HfP$+C$cJlFjt-2e!M)^nC z7$%3cYo%FAucQBiX;|r=FsuC_TKRl&CcNqg6NC#Z<$G}>-J*Lns#7+|pq;%Wln-w3 zt-94Q^=ND3bS>Xxg%lZK`rlZ>Bz_Y{+81%(tW_IujD+uuMckannzIud4`j0s&^vJ$uD7#H9_?YxmZhq literal 0 HcmV?d00001 diff --git a/build/classes/main/java/ru/caf82/result/others/MathService.class b/build/classes/ru/caf82/result/others/MathService.class similarity index 67% rename from build/classes/main/java/ru/caf82/result/others/MathService.class rename to build/classes/ru/caf82/result/others/MathService.class index b363daea49631db9a9a23d412a1cacf7c69c3458..167189b7fd9936fcc25874b56efd9cb080460dde 100644 GIT binary patch delta 36 qcmZqUy~i_Q5|fJ0#(83ljCzyzGa4|O0ZHk}qD*#-N}J=DG*|%Ap$ZuQ delta 79 zcmcb|)5bet5|5rwZenJhepX^xqW)wvCZ&nnzHnP03Eg3oo_vf^l-mJCERtIX!QX7g Hq`?9Jca9r@ diff --git a/build/classes/ru/caf82/result/others/ModelSelectionHibernateEntity.class b/build/classes/ru/caf82/result/others/ModelSelectionHibernateEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..652d262376ed27893cb72e79cb1124e952c17b73 GIT binary patch literal 358 zcmbVI%Sr=55Uk$pL)X;={~$T32L~jGpm-6*!x|3>xzDbnnJ~`4?5yBtc@jMM0e+O& z6Fhsc8>+jCrn>2`?~hLaQ;bRsuv=iSz>tt%Xsg2|VQ_G`B&1jFK@oIU03dWpepu*M$W1nFgC0D`@V}j}jf&y9z literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/others/ReviewHibernateEntity.class b/build/classes/ru/caf82/result/others/ReviewHibernateEntity.class new file mode 100644 index 0000000000000000000000000000000000000000..853f290118e4205b314da42ebab4baed249de3c0 GIT binary patch literal 334 zcmb7LW`-d@CyWhGen0sK&s z* zt47Ff+19$5X=j4}g|VNTjxa7=uWJ2tcA^}2edAT@=j=Ll$4kSn*G6Kj_Izc%@o(pZ z{J!m7%~KPS_x{`(FZ5Cuh>;ME{}WFbg|Dj7_F3Il3$8u(5y{P=NLn&QQ*mnTf#m1| b^e!MmCYlNc3T&)3%n3G;%S+f2jZmxrGwe`; literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/others/SwingModel.class b/build/classes/ru/caf82/result/others/SwingModel.class new file mode 100644 index 0000000000000000000000000000000000000000..b3060590ba1543179225713c37608c9cce340ca2 GIT binary patch literal 301 zcmaiv&q~8U5XQer^QXqt6yKnDQ4cOi4}}&lLQhc-Exm8z+HP4B*lgP8>Phh61Nczl zY$c_X zF8^EIZRJj82oVuR{{|6;{=YD?UW=DP0zSzXadQxB%uXCV5Z!)&4h#Y$tTAIC SL;t9Lj&O#QU&1+Sfb18-e?rLs literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/others/SwingTraining.class b/build/classes/ru/caf82/result/others/SwingTraining.class new file mode 100644 index 0000000000000000000000000000000000000000..33defa2b24b402eb7769ba99325ec39798dc140c GIT binary patch literal 310 zcma)1O-sW-5Pg&8qsG*h{)0j(>cNH5gP?dR^c31dOYfVwrd#3$HXHl9JP98B0sbg) z5_<9G47{25hIzw$|9pM{SYQ;Rhe3p^2tz{nsEu|{gx>Ydp5QO5XGIvM+NgE&nkl=J zS;@*ct#VoJrPVDzi@rPPnlMXkBXaq2KNnWjP3c7C4$9VId(x)ZS;;3%@j!^TRbz9t z(w*a<>D^Jj$pk(E!t_6Ogi*U9N@)tQ$&M;_n84%T+8|E$VhovyjswB%2k4yz4-sR? UGLWF(VcQ3|K+KhJ$><^Z1)y?9vj6}9 literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/workwithfiles/FileReader.class b/build/classes/ru/caf82/result/workwithfiles/FileReader.class new file mode 100644 index 0000000000000000000000000000000000000000..4b3a3d4010b01c3c8576855b41e44c5d63144483 GIT binary patch literal 363 zcma)&!A=4(5QhH&memymc>`|9!6wFoiNuSEr;R3R@Z4PnDc0Sj+lA-iWWvD*@S%)T zLc*0a`P=`SnNB;uf7>4bHy9*n;ygw#MnA>{p*=B$@%M!0=yFPEJ(M#h^iossQ~i~( zd()W}GDyo@+o^UY_&sd-g{cVR)YU52^V@6XxT>vJ>(YI$jbF@-9Q?lhbuBsi0ugodo{KXU3=7XSbN literal 0 HcmV?d00001 diff --git a/build/classes/ru/caf82/result/workwithfiles/FileWriter.class b/build/classes/ru/caf82/result/workwithfiles/FileWriter.class new file mode 100644 index 0000000000000000000000000000000000000000..cec15bcfadb3ab6c4eeb1f3f47f959787534e1c5 GIT binary patch literal 363 zcma)&&q@O^5XQf0yIozY{qqLiY7Yj)gP?d3JS}>t)N^*7+SIrUvswFGo&*m*fDa{3 zir}>bzU2GOOeUG{pU*D<=a^*Z;wZ&1#VEy?(7$q(3)h71^khNk-PBJ^80N0xyY{tU zd9a07GRf=G`h^u2{U7Xwm1_vITv}7w<;9s1ZdxDArk0nD3#+B`+?ZR{M{$AWl90{o zR!WXc`}~Ja*Y?d0kf2YP?s^|#6w8da)w8)T)?9|&s`Y&=I7Uaup}*GIkS=YmnyNEf f4(7S>T_EcjS7+`;^@th#Tf$pR Date: Mon, 2 Oct 2017 09:32:36 +0300 Subject: [PATCH 18/40] change SequenceProcessor and CountVectorizer --- .idea/workspace.xml | 126 +++++++----------- .../preprocessing/CountVectorizer.class | Bin 498 -> 12347 bytes .../preprocessing/SequenceProcessor.class | Bin 161 -> 681 bytes .../preprocessing/TfldfVectorizer.class | Bin 498 -> 882 bytes nbproject/private/private.xml | 5 +- .../preprocessing/CountVectorizer.java | 88 ++++++++++++ .../preprocessing/SequenceProcessor.java | 12 +- 7 files changed, 146 insertions(+), 85 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5aac466..79b210d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,12 +2,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -429,13 +413,7 @@ - - - - - - - + @@ -464,13 +442,7 @@ - - - - - - - + @@ -520,13 +492,7 @@ - - - - - - - + diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index ed2099a11c8c7d05a0552bcfca897546b4e81742..3f83c45f2ddf0f894c6a4c88032fadc3263c8efe 100644 GIT binary patch literal 12347 zcmbuF2XvK1u*bid4apEmDeir&g z=vSfNgnk$LL+DSTzl8o4j)X~=g^h5Aa3kSN;VfYhZY-QF+(bA>cst=-;ikgPgqsUn zVJF-|xTSC_;q8T63%3z&E4+j7j>0<$w-atJ+(CF};a!9~3U?CjEWE4mZo*xJy9##` z-d%VP;qJmcgnJ6_DZH2P-opC`_Y&S$ct7F&g?kGhAbg;3AK|{j{e=4qA0&LR@BraM zga--_56uwCKV&O}KFBQH__;TSZgs&97O89EwYlN>AzE1dh z;Twc+6uwFLX5m|eZxy~x_;%qtgzpr-OZaZ#dxTdBuNGb-yjFOfaHa5i;SIu7!uJYq z6y7AfS$K{H5?$!e0x2BmAxKcf#Kb{~-LM@K3@&3;!bgtMG5azYG5%{HO3=!heg2 z#E=*kW5i^LX(T37OqLiC(^yQlm?mO!#B3)fS4>ke&BQbpW5qZzEyT1G(@M3K( z>?vk1F?);IM@%m<`-<65%>H6}i#b5dfnxfI=_{t6nEql85_7Pa0b&jjGf>PRF^7s7 zEM|z9!^9je<_IxIiWw^AC^1Ki875}9m}A6@5R)fnq?l1+MvECE=2$WLV#bOYC+0XY z$BP*+<^(Y(iYX8?K}?~TiDD9BCW)CWW{Q|1F;m5yB&Jx*G%+P&O2teUGeb<7m~t@{ zVrGh&CFW!?v&GC2bBdT##hfPQbTMa$IaADBG4sUC7qdXjSz;E7StMq$m?dJCiaA@% zGBL}=oFit1n3ZDA6?2}L^Tk{s=0Y(SiMcr2Tw*TGj&jXqdJvk+v&q+W03NS(&=ML%O;jnFtD+(%#N=sDV7Ipd$o0TXl zE1H2L-``;00nES)yJs2E||q1=0{L!kzBhwdGw z75Vt*B%mw6_iiWgCd7E(dHbwpB~7e2O+l7 zeL3_HJ)CM>H*VD5wF3;$Ej}mS$hA6$bAckRSp`uEQ3bIcVlzawy0B&o>H%#5Xq$|h z>YCLd=bKd5Y|#U*W^-tSL^Ya)gbtUfc|S}@_$riWXYswNYwo2eJ5H`e`Hr=jsD z>$J3*0uuU?g0`M*>rm;JB3wOSR4bxN*CEkVn|TGj?Ft83OK7bNGWGV8-q zpnrAE`kG4A`1Z-Usf6kjO3n+zS0@)Im!nM0QnM~3Dxn%Iv>FxUW6y=7NDpf%gWNTub&*}n{5i?dpm?Abgn`~ zwenhN(vP<;xu|AUaz4z~y1@$XyKLWfL$GQypQ%!VR{QYLNrR2ndHs9vb7 zS+hp(JMCDhYCyfpU;=oz(wj#YgjuR;Hq!3nF>X?2p`AE8u(3hSuSeODRc2-#Jdg*mj3w;@)c>iF=mT3@MK6e?r! zz7X-YI=M`{`BfqowFe zVQih>p9kI@YMb;n)XjxDm|T_68GT=9&Twvq8eXT(1Q2H89ii^TK=6qsLwKXXMh)Tx zHM;SAd+5{}9aRP01=?7*Z*5?<{g)~qnmM(VP%SrP)m%6>blYI^c+-U0R)t-^M(6Nb z9Rpy8Vt=c@YP0^#OJ~CwS2r6E9^zTuiQardgLVpIRMW)+t~*uRT1AuHnq}({R_mLJ3tDt)* zzy?bjHBINuLi9)pqI{1yUH3V*a z^k>#+9vbCnGXzDv*k))B1^s69yALgb3FFO(7Mq|ZmWp9Egc-Bz9+o+NpiQZr)xtMi zk7Gc$#Jy^$`OrK^`-bzO3X9JUQ-zJ56NXD&5#mSKh+di4Kfx@jTClz9fh*IuQsZhX zubV#s)C@W39Wue+$ohvtst)_!4;uO{*2X@Dd_x~LdbPlw{+`OzcPz zR^ThcfmWMMuNvo-8deZA`p<{kdR?%FOgNvzp%h=T2p3$$@y&|G>zEp7{wViNQ=tU& z`8zjLd-x}pz&Z#IgpIaUe^+DoAZ+w0qKbO05E{tpnTLj!ZZ|x ztr{qfeHq^`!6xZUP_#DdpTDVW)wZ?q<(aMxcLe-M72(cVlDM+)SC&Bl78Uo9O2oZoz;kpCkZ1^7yp#Xvb|9v%j07HWb&e52Ic!Dsw2mhF4s;{?{^%hQ?gCauOv zkgh={*Uw((`JChXrQgZfs=FE>#Ff|CZwWL)_nhRy5D6M<*!VuHiw^BWR*$T(8zt2G zb0AKttwc4zYXC-$lQG*dnNz6crU6?ca(Qb~N;z%hWAbS6B4 z88fwuf5>8K>4ZOKGW|Qz#ot?1Kk@ zzxskwn0j@}eQ^@8>OTv3L#pLau+<;z{!?@)@E2n^$HFcP``!B&``s%BXQwuQT;mU3 z>({g;cn5(fLI|hZg%JJFFH%{G;IGJ&T2h+4l zXY2XAb%Pc0;PDVJS5BB-KhElG`Vp{Bw%&+s|D`INmbye3CB69(0XQ%5uEQsZx>;<8 zIt5|F>)D3z0`R&}ghxg49M}~lNZ^^Fw^Mu!qQvhUUsAIgA>_-#;TR`F)P{^d6GAdR z596+wH13R3N{L%Bsz{hyoAuV|ZMZ@Mt6 zj}HxHxWUh%n!*VF+c>}Wc=Mqo-h8Q~MxOc)&$z`|=Gq){ow*+0xZaRMkI(|^t zQU5c9|7KW!Imj$158n@W-sT(fu#Sd)pJ`L~cY}eY#l^Z_{oY%DDTsE~KLV(VnC_*G zQKnMAwbnl#*rI9}}UZcA}T-P4o)A8c)=}!KHDXr46YwV|IGR zYe~Oia%LN~+G==2(WqFh(W=%M zRqI$)E8nZsAqmo84iNCNPlQ4i?&0iC~+tu@d7{iQ`m> zS`c(u(5bsX3^tw^wg{=ADHmg4EhtFo|Ghx)7k*O|lePmE_S(3vMhZKFb+d7_^+ z?5Ym&tU~Xn=4$exH(b=@;Z0F)esj8MOVl*q*k*b88Mb*|ej{u1@-wZ=%g?ec^76&D z%*$_PnA2{Jyq^v_fpx>?ya(u-A83-+e_uHc3+jd+5J>@vHPp+YJ02fW)D!gyFF0l z9=4Cl?zXSW9=4y#p0>ZrJ?%j%_p%48+}jRNxsN?WWiLBW<-T^1%Khx2D)+a8Rra<+ zR32atQ+c30TxB17gv!45NR|EUP?i1dQ7R9zN2@&84pTY64p(`IJx1j~J3{3ko2T+n zJ5uFfJ4)pcJ6h#oc8toy?XfD4u=y&Fv}08cwc}JCWsg&Nv^`$sFgsr5aC?HvW9*44 zN7w?Dd3J)zk+x9fC_7Q*Xq!+u#!gastevbf-%e3E))uK8XQ!$>&Yq<5cw4M;yq%`< z1Y4r=L|dw|z)n{=!Ol=wXv}e`X?CB~??HMYk+cQ_U|%+eIp8+r=v9 z*d;1Yu}f8+YR^`Anq8*ybh}*T8TK5NXWA8c`OTxbb|o;+o(s&k=K%}s`M_EB0$`!N z5Ljd{0v6kgfhG15V5z+nINM$ZEVGvb%k34wIrd6mg}n+`X|D#(wbuaW*=vFG?RCHf z_Ilt#djoKhy%D(B-UM7?Zw4;4w*Z&fTY<~%ZNL@wcHl~T2XK|W6S&&m1zcnA2ClXD z0N2@7!1Z=DaD!a~+-TPVH`#T-&9)M_#jXc#wHtujY!z_3y%)H{ZUpYMn}ECQX5enS z1-Qpn1FP&-V70vuSYz)8*4hVvb@oA^(mn*Nw+{mw>?1&xeH6IYJ_c;Gj{}?R6ToKs zB(TLk1ytLofvxr#;6D2-aKEhq9D?+;3fMZ@Ur~~ zc*TAUylOuIUbCM9uiMXnH|*!YoAwLfE&C<#w*3lt$9@gGYrg^Bv)=;m+wXu6?DxQj z_6Oi2`y=qN{R#NQ{tSF-e*r$TzXG4z-+(Xd@4%P#58x~NC-AlX3;4$V4See;0>5)a z;P;Lg{K1g{e{_@q{^Y0;__L!-@E1o};IEDZ{LN8g@OMYq;2(~ffPXs50snHe9r(AS zT&4b@1T_W8Q8SPoH3y9&3uZWSU?WE@z)VLi!7N9uKykD^*w|5PFxycZu!*C#V2-05 z!0jCE2C?(KzrZN5_FjJ31a5=4d=P+|dc(F^*0IM>r|~^Bhe8M>;A5M>(1Zj&_s) z$2gh<9_wf_nD1x`IMz`SIL^^j@Hj^&fyX;42FE*^2A<%k1U%7EDOliWIyk}646x8q z8932VIhb%%0Zwu>6P)a57C6Px$zYMA+2B-1bHI}vodOm+Iu)Ge=rpjz(dl5Rqcgzi zj?M&UIGPKVIhqHSJDLwxI9dSCbaWOt%h5vcWJim@*^U;2a~v%JPjR#qJk`E5NyqR)X^!oeR!)bRM|C(fQz6jxGQfI=T>CJloM_;4(*-gUcOV0iNUNN^pgvtH70xt_II_bPaf(qiezQ9bE@r;OKhrLPs}% z7dg5Syx7rA;3bZ31}}AV3wW8MTfxg6-3DIa=yvc*M|Xf%Il2?P+Rp$Kxl83foF1lbvc*cpTw8Q5$x^D;~97#Wx~G{Yv> zu~kmuRAS{}U}IpP{88>=ID;Ys6HpTq0}BHy&@Q+Y5JLnM~zxdKjO3Ofev z7}<1Zs7OuGB0cew2&hNwc@T{7!*aF7`2@7`7Txxi&aPI8cCN**q`V{#~W!#VPrCuOr_0iHC0~8Xt!XPce1oClhc>sq|IQy^@4U z8d*72{;M_^p(4X~kbgPm)rO3KW_J55+F(3E-9&BtCB`vE*$_i@9=O&_;>958f7 zN-KB7&>9S<4DIJ8l?>a7((+ZA&!nC3Sw@+DVg%2o+^PznC);kJ3WjHiEn~swj~~WX z7G>t*oQnl9WRhF0^oMw9<j=iCv_igA)vJ4J zrO`1zT%23eX!Uv%(qgrg# zh>h07Mt_No))a)Q2(@t`pB2t>L4i)g)W{}lPNlVqUb#5VrCXRZq*`6fjm-y@>Zo)o zixO41Q4On4L}O>koTFi=^oA10@}!hn$Ty9}##Rp9W_bEvZDH71IsAHdO#Px(Z$|l# zGKMFcF--m#CoRMNAX!Oj{5l*?aTi-O;~so;Y2-byYCvecOem(E(Y|&64D54#+@rNq sCwsU;ajz-BRcsULV&~%WJ+vqT1YhC3@3+p-{!WO|jTHmKE+G&7-?S_Q?EnA( delta 140 zcmW-YyA8rX5Jcatxmz$_0~rw#A|N3lbwU$#;W|i9R6>MsKmnBF0uW`FPLoLrQp{&Q1NeTE4NzR5V6J?Sf7PaV$Fz4)OFNJQWxd TF)4-_<-q=rOy&K2E*gtJ=* - - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/main/java/ru/caf82/result/exceptions/EmptyArrayException.java - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/main/java/ru/caf82/result/others/MathService.java - + diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index 3491116..995a743 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -5,10 +5,98 @@ */ package ru.caf82.result.machinelearning.preprocessing; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * * @author 1 */ public class CountVectorizer implements SequenceProcessor, Transformer{ + private Map matrix = new HashMap<>(); +private String[] stopWords; +final float minDf; +final float maxDf; +final boolean parralize; +private static List defaultStopWordsList = new ArrayList( + Arrays.asList(new String[]{ + "а","е","и","ж","м","о","на","не","ни","об","но","он","мне","мои","мож","она","они","оно", + "мной","много","многочисленное","многочисленная","многочисленные","многочисленный", + "мною","мой","мог","могут","можно","может","можно","мор","моя","моё","мочь","над","нее", + "оба","нам","нем","нами","ними","мимо","немного","одной","одного","менее","однажды","однако", + "меня","нему","меньше","ней","наверху","него","ниже","мало","надо","один","одиннадцать","одиннадцатый", + "назад","наиболее","недавно","миллионов","недалеко","между","низко","меля","нельзя","нибудь", + "непрерывно","наконец","никогда","никуда","нас","наш","нет","нею","неё","них","мира","наша", + "наше","наши","ничего","начала","нередко","несколько","обычно","опять","около","мы","ну","нх","от","отовсюду", + "особенно","нужно","очень","отсюда","в","во","вон","вниз","внизу","вокруг","вот","восемнадцать", + "восемнадцатый","восемь","восьмой","вверх","вам","вами","важное","важная","важные","важный","вдали","везде", + "ведь","вас","ваш","ваша","ваше","ваши","впрочем","весь","вдруг","вы","все","второй","всем","всеми","времени","время", + "всему","всего","всегда","всех","всею","всю","вся","всё","всюду","г","год","говорил","говорит","года","году","где", + "да","ее","за","из","ли","же","им","до","по","ими","под","иногда","довольно","именно","долго","позже", + "более","должно","пожалуйста","значит","иметь","больше","пока","ему","имя","пор","пора","потом","потому","после", + "почему","почти","посреди","ей","два","две","двенадцать","двенадцатый","двадцать","двадцатый", + "двух","его","дел","или","без","день","занят","занята","занято","заняты","действительно","давно", + "девятнадцать","девятнадцатый","девять","девятый","даже","алло","жизнь","далеко","близко","здесь","дальше","для", + "лет","зато","даром","первый","перед","затем","зачем","лишь","десять","десятый","ею","её","их","бы","еще","при", + "был","про","процентов","против","просто","бывает","бывь","если","люди","была","были","было","будем","будет","будете","будешь", + "прекрасно","буду","будь","будто","будут","ещё","пятнадцать","пятнадцатый","друго","другое","другой","другие","другая","других","есть","пять", + "быть","лучше","пятый","к","ком","конечно","кому","кого","когда","которой","которого","которая","которые","который","которых","кем", + "каждое","каждая","каждые","каждый","кажется","как","какой","какая","кто","кроме","куда","кругом","с","т","у","я", + "та","те","уж","со","то","том","снова","тому","совсем","того","тогда","тоже","собой","тобой","собою","тобою", + "сначала","только","уметь","тот","тою","хорошо","хотеть","хочешь","хоть","хотя","свое","свои","твой","своей","своего","своих", + "свою","твоя","твоё","раз","уже","сам","там","тем","чем","сама","сами","теми","само","рано","самом","самому", + "самой","самого","семнадцать","семнадцатый","самим","самими","самих","саму", + "семь","чему","раньше","сейчас","чего","сегодня","себе","тебе","сеаой","человек","разве","теперь","себя","тебя","седьмой","спасибо", + "слишком","так","такое","такой","такие","также","такая","сих","тех","чаще","четвертый","через","часто","шестой","шестнадцать","шестнадцатый", + "шесть","четыре","четырнадцать","четырнадцатый","сколько","сказал","сказала","сказать", + "ту","ты","три","эта","эти","что","это","чтоб","этом","этому","этой","этого","чтобы","этот","стал","туда", + "этим","этими","рядом","тринадцать","тринадцатый","этих","третий","тут","эту","суть","чуть","тысяч" + }) + ); + + @Override + public List> fitAndTransform(List listOfTexts) { + + } + + @Override + public void fit(List listOfTexts) { + + } + + @Override + public List preprocess(String text) { + } + + @Override + public List> transform(List listOfTexts) { + + } + public CountVectorizer(float minDf, float maxDf, String[] stopWords, boolean parralize) { + this.minDf = minDf; + this.maxDf = maxDf; + this.stopWords = stopWords; + this.parralize = parralize; + } + public CountVectorizer(float minDf, float maxDf) { + this.minDf = minDf; + this.maxDf = maxDf; + parralize = false; + } + public CountVectorizer(String[] stopWords) { + this.stopWords = stopWords; + minDf = 0; + maxDf = Integer.MAX_VALUE; + parralize = false; + } + public CountVectorizer() { + minDf = 0; + maxDf = Integer.MAX_VALUE; + parralize = false; + } + } diff --git a/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java b/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java index e104707..af1e26d 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java @@ -5,10 +5,20 @@ */ package ru.caf82.result.machinelearning.preprocessing; +import java.util.List; +import java.util.Map; + /** * * @author 1 */ public interface SequenceProcessor { - + public List> fitAndTransform(List listOfTexts); + + public void fit(List listOfTexts); + + public List preprocess(String text); + + public List> transform(List listOfTexts); + } From 4d36cac2cef848c6edb57919f1576792ae32969d Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 2 Oct 2017 10:26:32 +0300 Subject: [PATCH 19/40] add in CountVectorizer method preprocess and countWords --- .../preprocessing/CountVectorizer.class | Bin 12347 -> 13835 bytes .../preprocessing/CountVectorizer.java | 35 ++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index 3f83c45f2ddf0f894c6a4c88032fadc3263c8efe..06d18e263addc993f068b3526c68988c647608ed 100644 GIT binary patch delta 5685 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 XUqS_9GQEN^XT1V;_5=H$k1PKH0^H$} diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index 995a743..a19a622 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -69,6 +69,16 @@ public void fit(List listOfTexts) { @Override public List preprocess(String text) { + + text.replaceAll(" - ?", "-"); + text.replaceAll("[^а-я -]",""); + text.replaceAll("- "," "); + text.replaceAll(" *"," "); + + String[] array = text.toLowerCase().split(" "); + List list = Arrays.asList(array); + list.removeAll(defaultStopWordsList); + return list; } @Override @@ -98,5 +108,30 @@ public CountVectorizer() { maxDf = Integer.MAX_VALUE; parralize = false; } + + public float getMinDf() { + return minDf; + } + public float getMaxDf() { + return maxDf; + } + + private Map countWords(String[] words) { + Map map = new HashMap(); + int value = 0; + for (String word : words) { + if (map.containsKey(word)) { + value = map.get(word); + value++; + } + + else { + value = 1; + } + map.put(word, value); + } + return map; + } + private Map countWordsAndEditMatrix(String[] words) {} } From a618adb134a38e87c0979ec2d26979063d2258aa Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 2 Oct 2017 11:03:47 +0300 Subject: [PATCH 20/40] change CountVectorizer --- .../preprocessing/CountVectorizer.class | Bin 13835 -> 14637 bytes .../preprocessing/CountVectorizer.java | 23 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index 06d18e263addc993f068b3526c68988c647608ed..645c7466b5601aa7f61e90aabd8fc29558fc2064 100644 GIT binary patch delta 6103 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 ID>^*lKheHbXaE2J delta 5391 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 XHcp5>Y!ahSngsoKC;l^FZRGy|c8Zk- diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index a19a622..aca9da0 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -64,7 +64,10 @@ public List> fitAndTransform(List listOfTexts) { @Override public void fit(List listOfTexts) { - + for (String text : listOfTexts) { + List list = preprocess(text); + countWordsAndEditMatrix(list); + } } @Override @@ -83,6 +86,8 @@ public List preprocess(String text) { @Override public List> transform(List listOfTexts) { + + } @@ -116,7 +121,7 @@ public float getMaxDf() { return maxDf; } - private Map countWords(String[] words) { + private Map countWords(List words) { Map map = new HashMap(); int value = 0; for (String word : words) { @@ -132,6 +137,18 @@ private Map countWords(String[] words) { } return map; } - private Map countWordsAndEditMatrix(String[] words) {} + private Map countWordsAndEditMatrix(List words) { + Map map = countWords(words); + int valueFromMatrix = 0; + for (Map.Entry pair : map.entrySet()) { + + if (matrix.containsKey(pair.getKey())) { + valueFromMatrix = matrix.get(pair.getKey()); + + } + matrix.put(pair.getKey(), valueFromMatrix + pair.getValue()); + } + return map; + } } From 95b518aa752db8c9aa0f4bc4fff634c57cab0ef8 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 2 Oct 2017 15:11:00 +0300 Subject: [PATCH 21/40] commit private.xml --- nbproject/private/private.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 6807a2b..63066cf 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,6 +2,10 @@ - + + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java + file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java + From ad1e12d09676f31506c8c14614472f80dd4f1893 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 2 Oct 2017 17:42:46 +0300 Subject: [PATCH 22/40] change preprocess method --- .../preprocessing/CountVectorizer.class | Bin 14637 -> 14675 bytes nbproject/private/private.xml | 2 -- .../preprocessing/CountVectorizer.java | 27 +++++++++--------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index 645c7466b5601aa7f61e90aabd8fc29558fc2064..050a1bd1155ce9b69d0f49c1408ce4758e2e16a6 100644 GIT binary patch delta 5502 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 ig~{j#R9qqZF&?XvJz89-~;p!dS(nv_!F% zj#I3o;}z@axr)o^1jPn=o?;`NsEE+>6_?Xe#U?sQv6)U*Y@t&WSJ0`7t#q2=N;8b< zifz0wL$RICR9r>N6j#$(ifia>#kF*f;yOB4aXr02aRZ&FxRK6R+(Z{BZl((rx6nn3 zTj^rOZFGs^_UQh%CAfnZmMZR~%M^Ff<%+xMg^GLVMT#BtV#Q9nLUAv>M6rvmRNO~b zDaz?;#csMrv4>u&xSy_7?4|1z4@CF>dc{6oxJ>aN-Jp1gZd5!>BZ^1p<%<1ulj2dj zS@9U%qIjHMp?HFBRXj$9DHtkDK M`wlVWCB;|y7yoLQivR!s diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 63066cf..0168918 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -3,9 +3,7 @@ - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.java file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.java diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index aca9da0..b87620c 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -73,22 +73,17 @@ public void fit(List listOfTexts) { @Override public List preprocess(String text) { - text.replaceAll(" - ?", "-"); - text.replaceAll("[^а-я -]",""); - text.replaceAll("- "," "); - text.replaceAll(" *"," "); - - String[] array = text.toLowerCase().split(" "); - List list = Arrays.asList(array); + text = text.toLowerCase().replaceAll("[^а-я -]","").replaceAll(" +-"," ").replaceAll("- +"," "); + + String[] array = text.split(" +"); + List list = new ArrayList(Arrays.asList(array)); list.removeAll(defaultStopWordsList); return list; } @Override public List> transform(List listOfTexts) { - - - + } public CountVectorizer(float minDf, float maxDf, String[] stopWords, boolean parralize) { @@ -104,13 +99,13 @@ public CountVectorizer(float minDf, float maxDf) { } public CountVectorizer(String[] stopWords) { this.stopWords = stopWords; - minDf = 0; - maxDf = Integer.MAX_VALUE; + minDf = 1; + maxDf = 1; parralize = false; } public CountVectorizer() { - minDf = 0; - maxDf = Integer.MAX_VALUE; + minDf = 1; + maxDf = 1; parralize = false; } @@ -150,5 +145,9 @@ private Map countWordsAndEditMatrix(List words) { } return map; } + //Проверка preprocess + public static void main (String[] args) { + + } } From acdbcebbd53d1709a3a0eab6ba8d13a49e299922 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Mon, 2 Oct 2017 19:09:13 +0300 Subject: [PATCH 23/40] add out --- .idea/TextClassfierProject.iml | 4 +- .idea/misc.xml | 4 +- .idea/workspace.xml | 367 +++++++++++++----- .../preprocessing/CountVectorizer.class | Bin 14675 -> 14690 bytes .../preprocessing/TfldfVectorizer.class | Bin 882 -> 1462 bytes .../diagramBomberman/GameObject.class | Bin 0 -> 175 bytes .../diagramBomberman/GameSession.class | Bin 0 -> 597 bytes .../lectures/diagramBomberman/Movable.class | Bin 0 -> 258 bytes .../diagramBomberman/Positioanable.class | Bin 0 -> 247 bytes .../lectures/diagramBomberman/Temporary.class | Bin 0 -> 239 bytes .../lectures/diagramBomberman/Tickable.class | Bin 0 -> 153 bytes .../lectures/lecture02/BoxingExample.class | Bin 0 -> 1304 bytes .../lecture02/BreakAndContinueExample.class | Bin 0 -> 1211 bytes .../lecture02/CalculatorExample.class | Bin 0 -> 1100 bytes .../lectures/lecture02/CommentsExample.class | Bin 0 -> 623 bytes .../ConstructorExample$Rectangular.class | Bin 0 -> 603 bytes .../lecture02/ConstructorExample.class | Bin 0 -> 562 bytes .../lecture02/ForAndForEachExample.class | Bin 0 -> 1055 bytes .../IfElseAndSwitchCaseExample.class | Bin 0 -> 883 bytes .../caf82/lectures/lecture02/LinkTypes.class | Bin 0 -> 1587 bytes .../lectures/lecture02/OperatorsExample.class | Bin 0 -> 3458 bytes .../lectures/lecture02/PrimitiveTypes.class | Bin 0 -> 1166 bytes .../lectures/lecture02/StringProcessing.class | Bin 0 -> 1627 bytes .../lecture02/WhileAndDoWhileExample.class | Bin 0 -> 941 bytes .../lectures/lecture03/AbstractAnimal.class | Bin 0 -> 888 bytes .../ru/caf82/lectures/lecture03/Animal.class | Bin 0 -> 311 bytes .../ru/caf82/lectures/lecture03/Cat.class | Bin 0 -> 585 bytes .../lecture03/CompositionExample.class | Bin 0 -> 2079 bytes .../caf82/lectures/lecture03/Crocodile.class | Bin 0 -> 561 bytes .../caf82/lectures/lecture03/Dishware.class | Bin 0 -> 467 bytes .../ru/caf82/lectures/lecture03/Dog.class | Bin 0 -> 388 bytes .../lecture03/InheritanceExample.class | Bin 0 -> 997 bytes .../lectures/lecture03/InterfaceExample.class | Bin 0 -> 607 bytes .../ru/caf82/lectures/lecture03/Kitty.class | Bin 0 -> 458 bytes .../lectures/lecture03/PassByValue.class | Bin 0 -> 2205 bytes .../lecture03/PolymorphysmExample.class | Bin 0 -> 1203 bytes .../caf82/lectures/lecture03/Season$1.class | Bin 0 -> 785 bytes .../ru/caf82/lectures/lecture03/Season.class | Bin 0 -> 2423 bytes .../ru/caf82/lectures/lecture03/Tiger.class | Bin 0 -> 673 bytes .../caf82/lectures/lecture03/Washable.class | Bin 0 -> 136 bytes .../ru/caf82/lectures/lecture03/Zoo.class | Bin 0 -> 729 bytes .../lectures/lecture04/DivideOnZero.class | Bin 0 -> 692 bytes .../lecture04/ExceptionCatchingExample.class | Bin 0 -> 1150 bytes .../ExceptionCatchingIhExample.class | Bin 0 -> 1100 bytes .../lecture04/MyExceptionClassExample.class | Bin 0 -> 1255 bytes .../lecture04/StackTraceExample.class | Bin 0 -> 1250 bytes .../TemplateForMyExceptionClass.class | Bin 0 -> 674 bytes .../lecture04/ThrowExample$NegException.class | Bin 0 -> 583 bytes .../lectures/lecture04/ThrowExample.class | Bin 0 -> 1667 bytes .../lecture04/WorkWithExceptions.class | Bin 0 -> 1299 bytes .../exceptions/EmptyArrayException.class | Bin 0 -> 809 bytes .../InconveninentShapeException.class | Bin 0 -> 833 bytes .../models/AbstractModel.class | Bin 0 -> 342 bytes .../machinelearning/models/Boosting.class | Bin 0 -> 363 bytes .../models/KNeighbourhood.class | Bin 0 -> 345 bytes .../machinelearning/models/LinearKernel.class | Bin 0 -> 376 bytes .../models/LogisticRegression.class | Bin 0 -> 393 bytes .../machinelearning/models/NaiveBayes.class | Bin 0 -> 369 bytes .../machinelearning/models/NormalKernel.class | Bin 0 -> 376 bytes .../preprocessing/CountVectorizer.class | Bin 0 -> 14590 bytes .../preprocessing/PorterStemmer.class | Bin 0 -> 488 bytes .../preprocessing/SequenceProcessor.class | Bin 0 -> 598 bytes .../preprocessing/TfldfVectorizer.class | Bin 0 -> 1353 bytes .../preprocessing/Transformer.class | Bin 0 -> 149 bytes .../preprocessing/WordProcessor.class | Bin 0 -> 153 bytes .../ru/caf82/result/others/Dao.class | Bin 0 -> 110 bytes .../result/others/DaoImplementation.class | Bin 0 -> 322 bytes .../ru/caf82/result/others/MathService.class | Bin 0 -> 1630 bytes .../ModelSelectionHibernateEntity.class | Bin 0 -> 358 bytes .../result/others/ReviewHibernateEntity.class | Bin 0 -> 334 bytes .../ru/caf82/result/others/SwingModel.class | Bin 0 -> 301 bytes .../caf82/result/others/SwingTraining.class | Bin 0 -> 310 bytes .../result/workwithfiles/FileReader.class | Bin 0 -> 363 bytes .../result/workwithfiles/FileWorker.class | Bin 0 -> 131 bytes .../result/workwithfiles/FileWriter.class | Bin 0 -> 363 bytes .../preprocessing/CountVectorizer.java | 6 +- .../preprocessing/TfldfVectorizer.java | 24 +- 77 files changed, 310 insertions(+), 95 deletions(-) create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/GameObject.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/GameSession.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/Movable.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/Positioanable.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/Temporary.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/diagramBomberman/Tickable.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/BoxingExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/BreakAndContinueExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/CalculatorExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/CommentsExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/ConstructorExample$Rectangular.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/ConstructorExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/ForAndForEachExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/IfElseAndSwitchCaseExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/LinkTypes.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/OperatorsExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/PrimitiveTypes.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/StringProcessing.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture02/WhileAndDoWhileExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/AbstractAnimal.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Animal.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Cat.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/CompositionExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Crocodile.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Dishware.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Dog.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/InheritanceExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/InterfaceExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Kitty.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/PassByValue.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/PolymorphysmExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Season$1.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Season.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Tiger.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Washable.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture03/Zoo.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/DivideOnZero.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/ExceptionCatchingExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/ExceptionCatchingIhExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/MyExceptionClassExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/StackTraceExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/TemplateForMyExceptionClass.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/ThrowExample$NegException.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/ThrowExample.class create mode 100644 out/production/TextClassfierProject/ru/caf82/lectures/lecture04/WorkWithExceptions.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/exceptions/EmptyArrayException.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/exceptions/InconveninentShapeException.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/AbstractModel.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/Boosting.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/KNeighbourhood.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/LinearKernel.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/LogisticRegression.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/NaiveBayes.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/models/NormalKernel.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/SequenceProcessor.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/TfldfVectorizer.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/Transformer.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/WordProcessor.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/Dao.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/DaoImplementation.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/MathService.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/ModelSelectionHibernateEntity.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/ReviewHibernateEntity.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/SwingModel.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/others/SwingTraining.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/workwithfiles/FileReader.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/workwithfiles/FileWorker.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/workwithfiles/FileWriter.class diff --git a/.idea/TextClassfierProject.iml b/.idea/TextClassfierProject.iml index d6ebd48..c90834f 100644 --- a/.idea/TextClassfierProject.iml +++ b/.idea/TextClassfierProject.iml @@ -2,7 +2,9 @@ - + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index f271ac3..d5d79e0 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,6 @@ - + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 79b210d..458191b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,13 @@ - + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -155,15 +163,15 @@ - - + + - - + - - + - - - + - - - + - - - - - - + + + + - + - - - + + + @@ -363,7 +371,7 @@ - + @@ -373,12 +381,12 @@ - + - + @@ -401,22 +409,11 @@ - - - - - - - - - - - - + @@ -424,7 +421,6 @@ - @@ -432,10 +428,7 @@ - - - - + @@ -655,7 +648,6 @@ - @@ -663,7 +655,6 @@ - @@ -671,7 +662,6 @@ - @@ -679,10 +669,6 @@ - - - - @@ -690,11 +676,6 @@ - - - - - @@ -702,18 +683,6 @@ - - - - - - - - - - - - @@ -721,20 +690,35 @@ - - - - - + + + + + + + + + + + + + + + + + + + + diff --git a/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/build/classes/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index 307052257a86e267cac28d15e2d25017029d0a50..ea6759265997fbfd55d4f1a8f5f6148dd9689db5 100644 GIT binary patch delta 6208 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 delta 5853 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 Kg#$JwGU{KRR^)&H diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml index 0168918..6807a2b 100644 --- a/nbproject/private/private.xml +++ b/nbproject/private/private.xml @@ -2,8 +2,6 @@ - - file:/C:/Users/1/Desktop/Hello%20world/TextClassfierProject/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java - + diff --git a/out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class b/out/production/TextClassfierProject/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.class index ca231aa9364afcf2baf18c9f8a6217036861ece7..85df3d6d81ab43aabf551c206cb90bc20c1acbe8 100644 GIT binary patch delta 6291 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 delta 5975 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 IeFZr4A2A4D!2kdN delta 123 zcmaDa|AJZi)W2Q(7#J8#7(}=jm>Kxl83foF1lbvc*cpT;cQdw47GzdpW@BKVe1_S3 z@-B`BDF#IbCZIwl1{MZZpgu+*1WE%*j>-GE#nd^0Vr)Pj0|O5O7nlUGSsA#2e2{8h JAj!nQ2LKcY4ut>! diff --git a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java index f000743..09bb2bd 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/CountVectorizer.java @@ -59,7 +59,12 @@ public class CountVectorizer implements SequenceProcessor, Transformer{ @Override public List> fitAndTransform(List listOfTexts) { - return null; + List> listOfMaps = new ArrayList<>(); + for (String text : listOfTexts) { + List list = preprocess(text); + listOfMaps.add(countWordsAndEditMatrix(list)); + } + return listOfMaps; } @Override @@ -72,10 +77,13 @@ public void fit(List listOfTexts) { @Override public List preprocess(String text) { - + PorterStemmer stemmer = new PorterStemmer(); text = text.toLowerCase().replaceAll("[^а-я -]","").replaceAll(" +-"," ").replaceAll("- +"," "); String[] array = text.split(" +"); + for (int i = 0; i list = new ArrayList(Arrays.asList(array)); list.removeAll(defaultStopWordsList); return list; @@ -83,7 +91,12 @@ public List preprocess(String text) { @Override public List> transform(List listOfTexts) { - return null; + List> listOfMaps = new ArrayList<>(); + for (String text : listOfTexts) { + List list = preprocess(text); + listOfMaps.add(countWords(list)); + } + return listOfMaps; } public CountVectorizer(float minDf, float maxDf, String[] stopWords, boolean parralize) { @@ -118,7 +131,7 @@ public float getMaxDf() { private Map countWords(List words) { Map map = new HashMap(); - int value = 0; + int value; for (String word : words) { if (map.containsKey(word)) { value = map.get(word); @@ -145,9 +158,6 @@ private Map countWordsAndEditMatrix(List words) { } return map; } - //Проверка preprocess - public static void main (String[] args) { - System.out.println("ololo"); - } + } diff --git a/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java b/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java index 2266c49..ca3dcc8 100644 --- a/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java +++ b/src/ru/caf82/result/machinelearning/preprocessing/PorterStemmer.java @@ -5,10 +5,98 @@ */ package ru.caf82.result.machinelearning.preprocessing; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + /** - * - * @author 1 + * Stolen by ilysko on 03.08.17. + * original: http://www.algorithmist.ru/2010/12/porter-stemmer-russian.html */ public class PorterStemmer implements Transformer, WordProcessor { - -} + + + private static final Pattern PERFECTIVEGROUND = Pattern.compile("((ив|ивши|ившись|ыв|ывши|ывшись)|((?<=[ая])(в|вши|вшись)))$"); + + private static final Pattern REFLEXIVE = Pattern.compile("(с[яь])$"); + + private static final Pattern ADJECTIVE = Pattern.compile("(ее|ие|ые|ое|ими|ыми|ей|ий|ый|ой|ем|им|ым|ом|его|ого|ему|ому|их|ых|ую|юю|ая|яя|ою|ею)$"); + + private static final Pattern PARTICIPLE = Pattern.compile("((ивш|ывш|ующ)|((?<=[ая])(ем|нн|вш|ющ|щ)))$"); + + private static final Pattern VERB = Pattern.compile("((ила|ыла|ена|ейте|уйте|ите|или|ыли|ей|уй|ил|ыл|им|ым|ен|ило|ыло|ено|ят|ует|уют|ит|ыт|ены|ить|ыть|ишь|ую|ю)|((?<=[ая])(ла|на|ете|йте|ли|й|л|ем|н|ло|но|ет|ют|ны|ть|ешь|нно)))$"); + + private static final Pattern NOUN = Pattern.compile("(а|ев|ов|ие|ье|е|иями|ями|ами|еи|ии|и|ией|ей|ой|ий|й|иям|ям|ием|ем|ам|ом|о|у|ах|иях|ях|ы|ь|ию|ью|ю|ия|ья|я)$"); + + private static final Pattern RVRE = Pattern.compile("^(.*?[аеиоуыэюя])(.*)$"); + + private static final Pattern DERIVATIONAL = Pattern.compile(".*[^аеиоуыэюя]+[аеиоуыэюя].*ость?$"); + + private static final Pattern DER = Pattern.compile("ость?$"); + + private static final Pattern SUPERLATIVE = Pattern.compile("(ейше|ейш)$"); + + private static final Pattern I = Pattern.compile("и$"); + private static final Pattern P = Pattern.compile("ь$"); + private static final Pattern NN = Pattern.compile("нн$"); + + public String stem(String word) { + word = word.toLowerCase(); + word = word.replace('ё', 'е'); + Matcher m = RVRE.matcher(word); + if (m.matches()) { + String pre = m.group(1); + String rv = m.group(2); + String temp = PERFECTIVEGROUND.matcher(rv).replaceFirst(""); + if (temp.equals(rv)) { + rv = REFLEXIVE.matcher(rv).replaceFirst(""); + temp = ADJECTIVE.matcher(rv).replaceFirst(""); + if (!temp.equals(rv)) { + rv = temp; + rv = PARTICIPLE.matcher(rv).replaceFirst(""); + } else { + temp = VERB.matcher(rv).replaceFirst(""); + if (temp.equals(rv)) { + rv = NOUN.matcher(rv).replaceFirst(""); + } else { + rv = temp; + } + } + + } else { + rv = temp; + } + + rv = I.matcher(rv).replaceFirst(""); + + if (DERIVATIONAL.matcher(rv).matches()) { + rv = DER.matcher(rv).replaceFirst(""); + } + + temp = P.matcher(rv).replaceFirst(""); + if (temp.equals(rv)) { + rv = SUPERLATIVE.matcher(rv).replaceFirst(""); + rv = NN.matcher(rv).replaceFirst("н"); + } else { + rv = temp; + } + word = pre + rv; + + } + + return word; + } + + /** + * Some tests + */ + public static void main(String[] args) { + PorterStemmer porterStemmer = new PorterStemmer(); + String[] listOfWords = new String[] {"букварь", "мамин-сибиряка", + "птица", "интересный", "космос", "космический"}; + for (String word: listOfWords) { + System.out.println("Результат применения PorterStemmer к слову " + word + " : " +porterStemmer.stem(word)); + } + } + + + } From bdd3840542263916f3e9d2b9e0f6031637d2274f Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Sun, 8 Oct 2017 19:18:30 +0300 Subject: [PATCH 25/40] change CountVectorizer --- .idea/workspace.xml | 77 ++++++++++-------- .../preprocessing/CountVectorizer.class | Bin 15125 -> 15181 bytes .../preprocessing/PorterStemmer.class | Bin 488 -> 4070 bytes nbproject/private/private.xml | 4 +- .../preprocessing/CountVectorizer.class | Bin 15114 -> 16147 bytes .../preprocessing/CountVectorizer.java | 77 +++++++++++++----- 6 files changed, 103 insertions(+), 55 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ac4467b..7c8c8c1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,11 +3,11 @@ + - - + - - + + - + + + + + + + + + + + - - + + @@ -60,8 +70,8 @@ @@ -86,10 +96,6 @@ - - - - @@ -143,6 +149,10 @@ - - - - @@ -722,8 +715,8 @@ - - + + From 28fdfa7e3bc621b69b640dc96a23e18e6b682b12 Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Wed, 11 Oct 2017 01:09:56 +0300 Subject: [PATCH 27/40] add MyOwnArrayList and Node --- .idea/workspace.xml | 234 ++++++++++++------ .../ru/caf82/result/MyOwnArrayList.class | Bin 0 -> 4583 bytes .../ru/caf82/result/Node.class | Bin 0 -> 1272 bytes .../preprocessing/CountVectorizer.class | Bin 16147 -> 15090 bytes src/ru/caf82/result/MyOwnArrayList.java | 144 +++++++++++ src/ru/caf82/result/Node.java | 27 ++ 6 files changed, 327 insertions(+), 78 deletions(-) create mode 100644 out/production/TextClassfierProject/ru/caf82/result/MyOwnArrayList.class create mode 100644 out/production/TextClassfierProject/ru/caf82/result/Node.class create mode 100644 src/ru/caf82/result/MyOwnArrayList.java create mode 100644 src/ru/caf82/result/Node.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 61d143f..9c30c34 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,7 +1,12 @@ - + + + + + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -34,17 +98,22 @@ - + - - - + + + + @@ -65,6 +134,8 @@ @@ -89,10 +160,6 @@ - - - - @@ -125,27 +192,14 @@ - - - - - - - - - - - - - - - - - + - @@ -726,7 +697,7 @@ - + @@ -740,61 +711,44 @@ - + - - + + - + - - - - - - - + + + - + - - - - - - - - - + + + - + - - + + - + - - + + - - - - - - - - + diff --git a/out/production/TextClassfierProject/ru/caf82/result/MyOwnArrayList.class b/out/production/TextClassfierProject/ru/caf82/result/MyOwnArrayList.class index 5dfb52b6c716913982c0086bb2f2011c1a34f655..08f4fab556bc9652467fa8f4f124b0c6ccea8d33 100644 GIT binary patch delta 2060 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 I^x?vP0dcTb(*OVf diff --git a/src/ru/caf82/result/MyOwnArrayList.java b/src/ru/caf82/result/MyOwnArrayList.java index 0baf51c..195da67 100644 --- a/src/ru/caf82/result/MyOwnArrayList.java +++ b/src/ru/caf82/result/MyOwnArrayList.java @@ -39,7 +39,7 @@ public int indexOf(Object element) { return -1; } - public void add(int index, E element) throws IndexOutOfBoundsException { + public void add(int index, E element){ if (index < 0 || index > size) { throw new IndexOutOfBoundsException(); } @@ -72,14 +72,14 @@ public int size() { return size; } - public E get(int index) throws IndexOutOfBoundsException { + public E get(int index) { if (index < 0 || index >= size) { throw new IndexOutOfBoundsException(); } return (E) arrayOfData[index]; } - public E set(int index, E element) throws IndexOutOfBoundsException { + public E set(int index, E element) { if (index < 0 || index >= size) { throw new IndexOutOfBoundsException(); } @@ -94,7 +94,7 @@ public void clear() { size = 0; } - public E remove(int index) throws IndexOutOfBoundsException { + public E remove(int index) { if (index < 0 || index >= size) { throw new IndexOutOfBoundsException(); } @@ -130,15 +130,4 @@ public String toString() { return stringBuilder.delete(stringBuilder.lastIndexOf(", "),stringBuilder.length()).append("]").toString(); } - public static void main(String[] args) { -//Тестим add - MyOwnArrayList myOwnArrayList = new MyOwnArrayList<>(); - myOwnArrayList.add(1); - myOwnArrayList.add(2); - myOwnArrayList.add(4); - System.out.println(myOwnArrayList); - myOwnArrayList.add(2,3); - System.out.println(myOwnArrayList); - System.out.println(myOwnArrayList.indexOf(1)); - } } From 1c3a0d4744ca2c833ae66a3ac9346485c232d8dc Mon Sep 17 00:00:00 2001 From: vyshka97 Date: Sun, 15 Oct 2017 12:32:18 +0300 Subject: [PATCH 29/40] add myOwnLinkedList --- .idea/workspace.xml | 142 ++++++++------ .../ru/caf82/result/MyOwnArrayList.class | Bin 4371 -> 3973 bytes .../ru/caf82/result/MyOwnLinkedList.class | Bin 0 -> 5243 bytes src/ru/caf82/result/MyOwnLinkedList.java | 175 ++++++++++++++++++ 4 files changed, 260 insertions(+), 57 deletions(-) create mode 100644 out/production/TextClassfierProject/ru/caf82/result/MyOwnLinkedList.class create mode 100644 src/ru/caf82/result/MyOwnLinkedList.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 836aeee..d44cd2d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,8 @@ + - - - - - - - - - - - @@ -34,10 +24,10 @@ - + - + @@ -46,12 +36,22 @@ - - + + - - - + + + + + + + + + + + + + @@ -76,6 +76,16 @@ + + + + + + + + + + @@ -107,6 +117,7 @@ @@ -131,6 +142,10 @@ + + + + @@ -167,10 +182,6 @@ + + + + @@ -189,7 +110,7 @@ - +