Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code reorganization #183

Open
wants to merge 41 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
f155b09
Merge pull request #2 from aosojnik/multitarget
aosojnik Nov 9, 2015
5c49882
Added some classifiers for multi-label classification
aosojnik Nov 9, 2015
6715ccf
Updates to multi-label methods
aosojnik Nov 9, 2015
fedd0d2
Cosmetic changes (fixed indentation)
aosojnik Nov 9, 2015
a94c96f
Merge branch 'master' of https://github.com/aosojnik/moa
aosojnik Nov 9, 2015
4e3116a
Removed merging artefacts
aosojnik Nov 9, 2015
5dec8c1
Additional merging artefacts fixed
aosojnik Nov 9, 2015
02d2683
Test commit of everything
aosojnik Nov 9, 2015
8e867c3
Revert "Test commit of everything"
aosojnik Nov 9, 2015
4436a24
Revert "Additional merging artefacts fixed"
aosojnik Nov 9, 2015
296844e
Revert "Removed merging artefacts"
aosojnik Nov 9, 2015
562350e
Updates with the new versions of the algorithms (some code is imported
aosojnik Nov 13, 2015
0f8677b
Merge pull request #8 from Waikato/master
abifet Mar 9, 2016
483366b
Intermediary commit for multi-label changes
aosojnik Mar 23, 2016
a78b6f3
Merge branch 'master' of https://github.com/abifet/moa
aosojnik Mar 23, 2016
df564f7
Merge branch 'master' of https://github.com/Waikato/moa
aosojnik Mar 23, 2016
60b81db
Instance, InstanceHeader, ArffReader, etc. rework
aosojnik Mar 24, 2016
3dfb80b
AttributeInformation streamlining and other fixes
aosojnik Mar 24, 2016
66c988f
Instances rework, new iSOUPTree models and import cleanup
aosojnik Jan 10, 2017
16f1214
Commit before cleanup
Jun 13, 2017
4d7a7a2
Added some classifiers for multi-label classification
aosojnik Nov 9, 2015
1cebdab
Updates to multi-label methods
aosojnik Nov 9, 2015
12f6b0c
Removed merging artefacts
aosojnik Nov 9, 2015
3bcb756
Additional merging artefacts fixed
aosojnik Nov 9, 2015
458ac70
Test commit of everything
aosojnik Nov 9, 2015
a40904d
Revert "Test commit of everything"
aosojnik Nov 9, 2015
5a48cb8
Revert "Additional merging artefacts fixed"
aosojnik Nov 9, 2015
e4f2eb6
Revert "Removed merging artefacts"
aosojnik Nov 9, 2015
b6037c6
Updates with the new versions of the algorithms (some code is imported
aosojnik Nov 13, 2015
1b6cdbf
Intermediary commit for multi-label changes
aosojnik Mar 23, 2016
90e39b2
Instance, InstanceHeader, ArffReader, etc. rework
aosojnik Mar 24, 2016
c4a4691
AttributeInformation streamlining and other fixes
aosojnik Mar 24, 2016
bdffa94
Instances rework, new iSOUPTree models and import cleanup
aosojnik Jan 10, 2017
32d534d
Commit before cleanup
Jun 13, 2017
d16bae0
Merge branch 'master' of https://github.com/aosojnik/moa into
aosojnik Jul 2, 2017
5c0c858
Learner, Prediction rework
aosojnik Jul 2, 2017
374ba36
Removed merging artifacts
Jul 3, 2017
e3549e9
Transitional commit
aosojnik Apr 17, 2018
f916c86
Merge with waikato/moa & bugfixes
aosojnik Sep 13, 2019
7d880aa
Merge with waikato/moa 2019-09
aosojnik Sep 13, 2019
5e8945e
Code reorganization
aosojnik Sep 16, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
Empty file modified README.md
100755 → 100644
Empty file.
19 changes: 19 additions & 0 deletions Release.key
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)

mQGiBE8ySNwRBACKcsg4AceGW7vuOSywcGiiNZg4I8vIzn7zphgj+s6/i2/hs8TQ
TOHy1s3b0f32ani3sBRmTWtgNv8+HSaKSVUcNqqNL+Jy6Pulyao7amGTtvqVKmuz
6ADrbVz0SxWmzTlSctdxK3g3yRSb+vfYrBPrbXNCNB5g9C/uK1uh0fpj1wCgn3MX
GFlZsO3bF7SNqqYlzpV6DM0D/AjnBlxTwRJOA1sLAVSXipLOdkjo00OQ8jgOFDio
oJsqLtsscNGocPCqNRo6QSVQKNs5sfYP2GXWTnPVM5oJI1p6bjuADRE8mneJrJvF
Uc+Mt1MdS6ttF4tVqd5Ncc8LKYQJRn+AtiuxAAayAA35JOslnMM0bqSYMlw4BJTP
8TlPA/4r+k+ucz3cJtM2aaL/ngUdrhmGKfGK7npXA3Ic6FzQo2NlJyKfWjSsR8x+
oN7tKEpuYxE5fcdbWd3v+4Ypx0LYMgBT1pUgI09AXxrx1cLRZI4yovrvQJgiA4Mh
CZ0eFkJJ1nwQR3NPMj5soar+7d3Ubc2EqkESGm0CgGtjgg+7HrQ6aXN2Om93bkNs
b3VkIE9CUyBQcm9qZWN0IDxpc3Y6b3duQ2xvdWRAYnVpbGQub3BlbnN1c2Uub3Jn
PohmBBMRAgAmBQJU2MJUAhsDBQkJxSl4BgsJCAcDAgQVAggDBBYCAwECHgECF4AA
CgkQl3xDqLpoQiMpOQCggCpaq5yz8C3ckqEr0RkTjICcQYMAnRvjarxoY6iSThDN
7vgxE1Fe8X5EiEYEExECAAYFAk8ySNwACgkQOzARt2udZSPlpwCfQZKNN8Rxx0LE
BF32EYXBdEvkMYYAoIt3lfXL8uwmjvyljzb0JgBQN1cF
=FJ6Q
-----END PGP PUBLIC KEY BLOCK-----
24 changes: 20 additions & 4 deletions moa/.classpath
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,19 @@
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-10">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand All @@ -35,5 +34,22 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
2 changes: 2 additions & 0 deletions moa/.settings/org.eclipse.jdt.apt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=false
9 changes: 6 additions & 3 deletions moa/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=10
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=10
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=10
org.eclipse.jdt.core.compiler.source=1.8
13 changes: 13 additions & 0 deletions moa/.settings/org.eclipse.jdt.core.prefs.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.8
Empty file modified moa/pom.xml
100755 → 100644
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public void trainOnInstanceImpl(Instance inst) {
}
}

public double[] getVotesForInstance(Instance inst) {
public Prediction getPredictionForInstance(Instance inst) {
if (this.bestSplit != null) {
int branch = this.bestSplit.splitTest.branchForInstance(inst);
if (branch >= 0) {
Expand Down
Loading