Skip to content
This repository has been archived by the owner on Mar 5, 2020. It is now read-only.

NL and AGF handling #143

Merged
merged 67 commits into from
Jul 17, 2018
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
daf740f
added the natlang and natlang.agf package, some interfaces and the fi…
FlxB2 Jun 26, 2018
b199e53
added first steps for the parser
FlxB2 Jun 27, 2018
06af78b
added first steps for the parser
FlxB2 Jun 27, 2018
5230072
removed unnecessary interface
FlxB2 Jun 30, 2018
6cab908
added optional groups and forbids a number following another number
FlxB2 Jun 30, 2018
d0abc7b
some cleanup
FlxB2 Jun 30, 2018
2fdfee9
added parse to jsgf expression and changed some things in the parser
FlxB2 Jul 2, 2018
ce401aa
added tests for JSGF Generator and for AGF Trees
FlxB2 Jul 2, 2018
165f63e
added NLLexer and some tests
FlxB2 Jul 3, 2018
0640266
build fix
FlxB2 Jul 3, 2018
13aa395
NLLexer is now iterator
FlxB2 Jul 3, 2018
6e86c39
removed GrammarParser and completed JSGFGenerator class
FlxB2 Jul 3, 2018
a45915d
readded deprecated methods, fixed tests and removed some code smells
FlxB2 Jul 3, 2018
33a3d98
Merge remote-tracking branch 'origin/dev' into NLandAGFparser
Legion2 Jul 3, 2018
5828d9e
added breaking todos
Legion2 Jul 3, 2018
acf5352
changes things mentioned in buddy200's review
FlxB2 Jul 4, 2018
b3d9aaf
AGFLexer is now implements Iterator<AGFToken>
FlxB2 Jul 4, 2018
973fa7b
added NLParser and a single test - more to come
FlxB2 Jul 4, 2018
f52964c
Merge remote-tracking branch 'origin/dev' into NLandAGFparser
Legion2 Jul 6, 2018
0a06c64
fixed typo
Legion2 Jul 6, 2018
69a0737
replaced SpeechCommandHandler with NLProcessingManager
Legion2 Jul 6, 2018
e74d7e2
fixed grammar generation
Legion2 Jul 7, 2018
6dabd03
removed deprecated code
Legion2 Jul 7, 2018
c009752
test fix
FlxB2 Jul 7, 2018
7c4c89f
solved strange merge conflict
FlxB2 Jul 7, 2018
e6feded
removed NLParser and merge its remaining content with NLLexer
FlxB2 Jul 7, 2018
488b37f
quick fix and small changes
FlxB2 Jul 7, 2018
3ae5085
adds a working parser - cleanup and better tests coming tomorrow - sorry
FlxB2 Jul 7, 2018
7ae2d21
added better test and NLParser is now able to return the index of the…
FlxB2 Jul 8, 2018
6c22393
changed NLLexer to return List of tokens
Legion2 Jul 8, 2018
bd9ad39
fixed sonarcloud issues
Legion2 Jul 8, 2018
ec54c43
Merge remote-tracking branch 'origin/dev' into NLandAGFparser
Legion2 Jul 9, 2018
d1c22be
moved annotaions to natlang package
Legion2 Jul 9, 2018
461416e
removed keywords from SpeechCommand
Legion2 Jul 9, 2018
d0574b8
improved error handling in NLI method call
Legion2 Jul 10, 2018
bc77808
implemented traceback for NLParser
FlxB2 Jul 11, 2018
5c490b4
fixed sonarcloud issues
FlxB2 Jul 11, 2018
fc83a92
Merge remote-tracking branch 'origin/dev' into NLandAGFparser
Legion2 Jul 11, 2018
e392e49
Merge branch 'NLandAGFparser' of github.com:AmyAssist/Amy into NLandA…
Legion2 Jul 11, 2018
7582239
Merge branch 'dev' into NLandAGFparser
Legion2 Jul 11, 2018
1e5967c
Merge branch 'NLandAGFparser' of https://github.com/AmyAssist/Amy int…
FlxB2 Jul 11, 2018
33e579a
fixed unused imports
FlxB2 Jul 11, 2018
fdfe562
added written number support in english
FlxB2 Jul 13, 2018
2cf98f4
sonarcloud issues and test for written numbers
FlxB2 Jul 13, 2018
271e526
fixed another sonarcloud issue, the others wont be fixed for now
FlxB2 Jul 13, 2018
e5a81b5
fixed bug for agfs like [very | very very] by sorting children of OR …
FlxB2 Jul 13, 2018
3cc71b4
NLParser now uses a lambda expression to sort instead of AGFNodes imp…
FlxB2 Jul 14, 2018
89f7168
fixed stupid bug with nested or/optional groups
FlxB2 Jul 14, 2018
5d49520
created language specifics class
FlxB2 Jul 14, 2018
cccf1ae
fixed path of english.natlang file
FlxB2 Jul 14, 2018
d39adf0
Merge branch 'dev' into NLandAGFparser
FlxB2 Jul 14, 2018
ce70595
fixed broken merge
Legion2 Jul 14, 2018
5f79286
moved resource to the correct package
Legion2 Jul 14, 2018
e68830e
turned logging into exception throwing, because logging don't fix the…
Legion2 Jul 14, 2018
8a5e84e
fixed JavaDoc comments
Legion2 Jul 14, 2018
c17cfd8
resolved loop in loop problem
Legion2 Jul 14, 2018
f832a67
changed name of custom rule in jsgf grammar from <digit> to <number>
FlxB2 Jul 14, 2018
e2565c8
removed duplicate code in jsgf generator
FlxB2 Jul 14, 2018
457a87a
fixed javadoc's
FlxB2 Jul 14, 2018
48b2852
Merge branch 'dev' into NLandAGFparser
FlxB2 Jul 14, 2018
b54ce76
Merge branch 'dev' into NLandAGFparser
FlxB2 Jul 15, 2018
80f621e
Merge branch 'dev' into NLandAGFparser
FlxB2 Jul 16, 2018
a6ec0c5
fixed some things mentioned in @neumantm's review
FlxB2 Jul 16, 2018
4749b78
LanguageSpecifics iterates over every line
FlxB2 Jul 16, 2018
df7c628
removed and from jsgf, this will be re added in the next sprint
FlxB2 Jul 16, 2018
c2562d8
forgot unused variable
FlxB2 Jul 16, 2018
27e0a23
Merge branch 'dev' into NLandAGFparser
FlxB2 Jul 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

// TODO move the class in a package in the natlang package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Complete the task associated to this TODO comment. (squid:S1135)

See it in SonarCloud

/**
* The definition of a grammar annotation.
*
Expand All @@ -38,7 +39,9 @@
@Target(java.lang.annotation.ElementType.METHOD)
public @interface Grammar {
/**
* @return the grammar
* TODO description
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Complete the task associated to this TODO comment. (squid:S1135)

See it in SonarCloud

*
* @return the grammar in AGF - Amy Grammar Format
*/
String value();
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

//TODO move the class in a package in the natlang package
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Complete the task associated to this TODO comment. (squid:S1135)

See it in SonarCloud

//TODO rename the annotation
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Complete the task associated to this TODO comment. (squid:S1135)

See it in SonarCloud

/**
* The definition of a speech command annotation
*
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*
* @author Felix Burk
*/
@Deprecated
public class PluginGrammarInfo {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Do not forget to remove this deprecated code someday. (squid:S1133)

See it in SonarCloud

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Add the missing @deprecated Javadoc tag. (squid:MissingDeprecatedCheck)

See it in SonarCloud


List<String> keywords;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
*
* @author Felix Burk
*/
@Deprecated
public class TextToPlugin {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Do not forget to remove this deprecated code someday. (squid:S1133)

See it in SonarCloud

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Smell Code Smell: Add the missing @deprecated Javadoc tag. (squid:MissingDeprecatedCheck)

See it in SonarCloud


Set<PluginGrammarInfo> infos;
Expand Down
Loading