Revision: 9242
http://languagetool.svn.sourceforge.net/languagetool/?rev=9242&view=rev
Author: dnaber
Date: 2013-01-27 15:45:21 +0000 (Sun, 27 Jan 2013)
Log Message:
-----------
cleanup: whitespace, 'final'
Modified Paths:
--------------
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/synthesis/ManualSynthesizerAdapter.java
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapter.java
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapterTest.java
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/WordTokenizerTest.java
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/synthesis/ManualSynthesizerAdapter.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/synthesis/ManualSynthesizerAdapter.java
2013-01-27 15:44:35 UTC (rev 9241)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/synthesis/ManualSynthesizerAdapter.java
2013-01-27 15:45:21 UTC (rev 9242)
@@ -12,38 +12,38 @@
* Note: It resides in "test" package because for now it is only used on unit
testing.
*/
public class ManualSynthesizerAdapter extends BaseSynthesizer implements
Synthesizer {
-
- private ManualSynthesizer manualSynthesizer;
-
- public ManualSynthesizerAdapter(ManualSynthesizer manualSynthesizer) {
- super(null, null); // no file
- this.manualSynthesizer = manualSynthesizer;
- }
-
- @Override
- protected void initSynthesizer() throws IOException {
- synthesizer = new IStemmer() { // null synthesiser
- @Override
- public List<WordData> lookup(CharSequence word) {
- return new ArrayList<WordData>();
- }
- };
- }
-
- @Override
- protected void initPossibleTags() throws IOException {
- if (possibleTags == null) {
- possibleTags = new
ArrayList<String>(manualSynthesizer.getPossibleTags());
- }
- }
-
- @Override
- protected void lookup(String lemma, String posTag, List<String>
results) {
- super.lookup(lemma, posTag, results);
- final List<String> manualForms =
manualSynthesizer.lookup(lemma.toLowerCase(), posTag);
- if (manualForms != null) {
- results.addAll(manualForms);
- }
- }
+ private final ManualSynthesizer manualSynthesizer;
+
+ public ManualSynthesizerAdapter(ManualSynthesizer manualSynthesizer) {
+ super(null, null); // no file
+ this.manualSynthesizer = manualSynthesizer;
+ }
+
+ @Override
+ protected void initSynthesizer() throws IOException {
+ synthesizer = new IStemmer() { // null synthesiser
+ @Override
+ public List<WordData> lookup(CharSequence word) {
+ return new ArrayList<WordData>();
+ }
+ };
+ }
+
+ @Override
+ protected void initPossibleTags() throws IOException {
+ if (possibleTags == null) {
+ possibleTags = new
ArrayList<String>(manualSynthesizer.getPossibleTags());
+ }
+ }
+
+ @Override
+ protected void lookup(String lemma, String posTag, List<String> results) {
+ super.lookup(lemma, posTag, results);
+ final List<String> manualForms =
manualSynthesizer.lookup(lemma.toLowerCase(), posTag);
+ if (manualForms != null) {
+ results.addAll(manualForms);
+ }
+ }
+
}
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapter.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapter.java
2013-01-27 15:44:35 UTC (rev 9241)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapter.java
2013-01-27 15:45:21 UTC (rev 9242)
@@ -16,46 +16,45 @@
*/
public class ManualTaggerAdapter implements Tagger {
- private final ManualTagger manualTagger;
+ private final ManualTagger manualTagger;
- public ManualTaggerAdapter(ManualTagger manualTagger) {
- this.manualTagger = manualTagger;
- }
+ public ManualTaggerAdapter(ManualTagger manualTagger) {
+ this.manualTagger = manualTagger;
+ }
- @Override
- public List<AnalyzedTokenReadings> tag(List<String> sentenceTokens)
- throws IOException {
- final List<AnalyzedTokenReadings> tokenReadings = new
ArrayList<AnalyzedTokenReadings>();
- int pos = 0;
- for (final String word : sentenceTokens) {
- final List<AnalyzedToken> l = new
ArrayList<AnalyzedToken>();
- final String[] manualTags =
manualTagger.lookup(word.toLowerCase());
- if (manualTags != null) {
- for (int i = 0; i < manualTags.length; i = i +
2) {
- l.add(new AnalyzedToken(word,
manualTags[i + 1],
- manualTags[i]));
- }
- }
- if (l.isEmpty()) {
- l.add(new AnalyzedToken(word, null, null));
- }
- tokenReadings.add(new AnalyzedTokenReadings(l
- .toArray(new AnalyzedToken[l.size()]),
pos));
- pos += word.length();
- }
+ @Override
+ public List<AnalyzedTokenReadings> tag(List<String> sentenceTokens)
+ throws IOException {
+ final List<AnalyzedTokenReadings> tokenReadings = new
ArrayList<AnalyzedTokenReadings>();
+ int pos = 0;
+ for (final String word : sentenceTokens) {
+ final List<AnalyzedToken> l = new ArrayList<AnalyzedToken>();
+ final String[] manualTags = manualTagger.lookup(word.toLowerCase());
+ if (manualTags != null) {
+ for (int i = 0; i < manualTags.length; i = i + 2) {
+ l.add(new AnalyzedToken(word, manualTags[i + 1],
+ manualTags[i]));
+ }
+ }
+ if (l.isEmpty()) {
+ l.add(new AnalyzedToken(word, null, null));
+ }
+ tokenReadings.add(new AnalyzedTokenReadings(l.toArray(new
AnalyzedToken[l.size()]), pos));
+ pos += word.length();
+ }
- return tokenReadings;
- }
+ return tokenReadings;
+ }
- @Override
- public AnalyzedTokenReadings createNullToken(String token, int
startPos) {
- return new AnalyzedTokenReadings(new AnalyzedToken(token, null,
null),
- startPos);
- }
+ @Override
+ public AnalyzedTokenReadings createNullToken(String token, int startPos) {
+ return new AnalyzedTokenReadings(new AnalyzedToken(token, null, null),
+ startPos);
+ }
- @Override
- public AnalyzedToken createToken(String token, String posTag) {
- return new AnalyzedToken(token, posTag, null);
- }
+ @Override
+ public AnalyzedToken createToken(String token, String posTag) {
+ return new AnalyzedToken(token, posTag, null);
+ }
}
\ No newline at end of file
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapterTest.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapterTest.java
2013-01-27 15:44:35 UTC (rev 9241)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/ManualTaggerAdapterTest.java
2013-01-27 15:45:21 UTC (rev 9242)
@@ -12,115 +12,113 @@
import org.languagetool.tagging.Tagger;
/**
- * Test class for {@link ManualTaggerAdapter}.
* @author Ionuț Păduraru
*/
public class ManualTaggerAdapterTest extends TestCase {
- final static String TEST_DATA =
- "# some test data\n" +
- "inflectedform11\tlemma1\tPOS1\n" +
- "inflectedform121\tlemma1\tPOS2\n" +
- "inflectedform122\tlemma1\tPOS2\n" +
- "inflectedform123\tlemma1\tPOS3\n" +
- "inflectedform2\tlemma2\tPOS1a\n" +
- "inflectedform2\tlemma2\tPOS1b\n" +
- "inflectedform2\tlemma2\tPOS1c\n" +
- "inflectedform3\tlemma3a\tPOS3a\n" +
- "inflectedform3\tlemma3b\tPOS3b\n" +
- "inflectedform3\tlemma3c\tPOS3c\n" +
- "inflectedform3\tlemma3d\tPOS3d\n";
-
+ private final static String TEST_DATA =
+ "# some test data\n" +
+ "inflectedform11\tlemma1\tPOS1\n" +
+ "inflectedform121\tlemma1\tPOS2\n" +
+ "inflectedform122\tlemma1\tPOS2\n" +
+ "inflectedform123\tlemma1\tPOS3\n" +
+ "inflectedform2\tlemma2\tPOS1a\n" +
+ "inflectedform2\tlemma2\tPOS1b\n" +
+ "inflectedform2\tlemma2\tPOS1c\n" +
+ "inflectedform3\tlemma3a\tPOS3a\n" +
+ "inflectedform3\tlemma3b\tPOS3b\n" +
+ "inflectedform3\tlemma3c\tPOS3c\n" +
+ "inflectedform3\tlemma3d\tPOS3d\n";
- protected Tagger tagger;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- tagger = new ManualTaggerAdapter(new ManualTagger(new
ByteArrayInputStream(TEST_DATA.getBytes("UTF-8"))));
- }
-
- public void testMultipleLemma() throws Exception {
- List<String> l = Arrays.asList("inflectedform3");
- List<AnalyzedTokenReadings> analyzedTokenReadings =
tagger.tag(l);
- assertNotNull(analyzedTokenReadings);
- assertEquals(1, analyzedTokenReadings.size());
-
- final AnalyzedTokenReadings analyzedTokenReading =
analyzedTokenReadings.get(0);
- assertEquals("inflectedform3", analyzedTokenReading.getToken());
- assertNotNull(analyzedTokenReading.getReadings());
- assertEquals(4, analyzedTokenReading.getReadingsLength());
-
-
- AnalyzedToken analyzedToken;
-
- analyzedToken = analyzedTokenReading.getReadings().get(0);
- assertEquals("inflectedform3", analyzedToken.getToken());
- assertEquals("lemma3a", analyzedToken.getLemma());
- assertEquals("POS3a", analyzedToken.getPOSTag());
-
- analyzedToken = analyzedTokenReading.getReadings().get(1);
- assertEquals("inflectedform3", analyzedToken.getToken());
- assertEquals("lemma3b", analyzedToken.getLemma());
- assertEquals("POS3b", analyzedToken.getPOSTag());
-
- analyzedToken = analyzedTokenReading.getReadings().get(2);
- assertEquals("inflectedform3", analyzedToken.getToken());
- assertEquals("lemma3c", analyzedToken.getLemma());
- assertEquals("POS3c", analyzedToken.getPOSTag());
-
- analyzedToken = analyzedTokenReading.getReadings().get(3);
- assertEquals("inflectedform3", analyzedToken.getToken());
- assertEquals("lemma3d", analyzedToken.getLemma());
- assertEquals("POS3d", analyzedToken.getPOSTag());
- }
-
- public void testMultiplePOS() throws Exception {
- List<String> l = Arrays.asList("inflectedform2");
- List<AnalyzedTokenReadings> analyzedTokenReadings =
tagger.tag(l);
- assertNotNull(analyzedTokenReadings);
- assertEquals(1, analyzedTokenReadings.size());
- AnalyzedTokenReadings analyzedTokenReading =
analyzedTokenReadings.get(0);
- assertEquals("inflectedform2", analyzedTokenReading.getToken());
- assertNotNull(analyzedTokenReading.getReadings());
- assertEquals(3,analyzedTokenReading.getReadingsLength());
- AnalyzedToken analyzedToken;
-
- analyzedToken = analyzedTokenReading.getReadings().get(0);
- assertEquals("POS1a", analyzedToken.getPOSTag());
- assertEquals("inflectedform2", analyzedToken.getToken());
- assertEquals("lemma2", analyzedToken.getLemma());
-
- analyzedToken = analyzedTokenReading.getReadings().get(1);
- assertEquals("POS1b", analyzedToken.getPOSTag());
- assertEquals("inflectedform2", analyzedToken.getToken());
- assertEquals("lemma2", analyzedToken.getLemma());
-
- analyzedToken = analyzedTokenReading.getReadings().get(2);
- assertEquals("POS1c", analyzedToken.getPOSTag());
- assertEquals("inflectedform2", analyzedToken.getToken());
- assertEquals("lemma2", analyzedToken.getLemma());
- }
- public void testMultipleWords() throws Exception {
- List<String> l = Arrays.asList("inflectedform2",
"inflectedform3");
- List<AnalyzedTokenReadings> analyzedTokenReadings =
tagger.tag(l);
- assertNotNull(analyzedTokenReadings);
- assertEquals(2, analyzedTokenReadings.size());
-
- AnalyzedTokenReadings analyzedTokenReading;
-
- analyzedTokenReading = analyzedTokenReadings.get(0);
- assertEquals("inflectedform2", analyzedTokenReading.getToken());
- assertNotNull(analyzedTokenReading.getReadings());
- assertEquals(3,analyzedTokenReading.getReadingsLength());
- // analyzedTokenReading.getReadings are tested by
#testMultipleLemma()
-
- analyzedTokenReading = analyzedTokenReadings.get(1);
- assertEquals("inflectedform3", analyzedTokenReading.getToken());
- assertNotNull(analyzedTokenReading.getReadings());
- assertEquals(4, analyzedTokenReading.getReadingsLength());
- // analyzedTokenReading.getReadings are tested by
#testMultiplePOS()
- }
-
+ protected Tagger tagger;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ tagger = new ManualTaggerAdapter(new ManualTagger(new
ByteArrayInputStream(TEST_DATA.getBytes("UTF-8"))));
+ }
+
+ public void testMultipleLemma() throws Exception {
+ final List<String> l = Arrays.asList("inflectedform3");
+ final List<AnalyzedTokenReadings> analyzedTokenReadings = tagger.tag(l);
+ assertNotNull(analyzedTokenReadings);
+ assertEquals(1, analyzedTokenReadings.size());
+
+ final AnalyzedTokenReadings analyzedTokenReading =
analyzedTokenReadings.get(0);
+ assertEquals("inflectedform3", analyzedTokenReading.getToken());
+ assertNotNull(analyzedTokenReading.getReadings());
+ assertEquals(4, analyzedTokenReading.getReadingsLength());
+
+ AnalyzedToken analyzedToken;
+
+ analyzedToken = analyzedTokenReading.getReadings().get(0);
+ assertEquals("inflectedform3", analyzedToken.getToken());
+ assertEquals("lemma3a", analyzedToken.getLemma());
+ assertEquals("POS3a", analyzedToken.getPOSTag());
+
+ analyzedToken = analyzedTokenReading.getReadings().get(1);
+ assertEquals("inflectedform3", analyzedToken.getToken());
+ assertEquals("lemma3b", analyzedToken.getLemma());
+ assertEquals("POS3b", analyzedToken.getPOSTag());
+
+ analyzedToken = analyzedTokenReading.getReadings().get(2);
+ assertEquals("inflectedform3", analyzedToken.getToken());
+ assertEquals("lemma3c", analyzedToken.getLemma());
+ assertEquals("POS3c", analyzedToken.getPOSTag());
+
+ analyzedToken = analyzedTokenReading.getReadings().get(3);
+ assertEquals("inflectedform3", analyzedToken.getToken());
+ assertEquals("lemma3d", analyzedToken.getLemma());
+ assertEquals("POS3d", analyzedToken.getPOSTag());
+ }
+
+ public void testMultiplePOS() throws Exception {
+ final List<String> l = Arrays.asList("inflectedform2");
+ final List<AnalyzedTokenReadings> analyzedTokenReadings = tagger.tag(l);
+ assertNotNull(analyzedTokenReadings);
+ assertEquals(1, analyzedTokenReadings.size());
+ final AnalyzedTokenReadings analyzedTokenReading =
analyzedTokenReadings.get(0);
+ assertEquals("inflectedform2", analyzedTokenReading.getToken());
+ assertNotNull(analyzedTokenReading.getReadings());
+ assertEquals(3,analyzedTokenReading.getReadingsLength());
+ AnalyzedToken analyzedToken;
+
+ analyzedToken = analyzedTokenReading.getReadings().get(0);
+ assertEquals("POS1a", analyzedToken.getPOSTag());
+ assertEquals("inflectedform2", analyzedToken.getToken());
+ assertEquals("lemma2", analyzedToken.getLemma());
+
+ analyzedToken = analyzedTokenReading.getReadings().get(1);
+ assertEquals("POS1b", analyzedToken.getPOSTag());
+ assertEquals("inflectedform2", analyzedToken.getToken());
+ assertEquals("lemma2", analyzedToken.getLemma());
+
+ analyzedToken = analyzedTokenReading.getReadings().get(2);
+ assertEquals("POS1c", analyzedToken.getPOSTag());
+ assertEquals("inflectedform2", analyzedToken.getToken());
+ assertEquals("lemma2", analyzedToken.getLemma());
+ }
+
+ public void testMultipleWords() throws Exception {
+ final List<String> l = Arrays.asList("inflectedform2", "inflectedform3");
+ final List<AnalyzedTokenReadings> analyzedTokenReadings = tagger.tag(l);
+ assertNotNull(analyzedTokenReadings);
+ assertEquals(2, analyzedTokenReadings.size());
+
+ AnalyzedTokenReadings analyzedTokenReading;
+
+ analyzedTokenReading = analyzedTokenReadings.get(0);
+ assertEquals("inflectedform2", analyzedTokenReading.getToken());
+ assertNotNull(analyzedTokenReading.getReadings());
+ assertEquals(3,analyzedTokenReading.getReadingsLength());
+ // analyzedTokenReading.getReadings are tested by #testMultipleLemma()
+
+ analyzedTokenReading = analyzedTokenReadings.get(1);
+ assertEquals("inflectedform3", analyzedTokenReading.getToken());
+ assertNotNull(analyzedTokenReading.getReadings());
+ assertEquals(4, analyzedTokenReading.getReadingsLength());
+ // analyzedTokenReading.getReadings are tested by #testMultiplePOS()
+ }
+
}
Modified:
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/WordTokenizerTest.java
===================================================================
---
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/WordTokenizerTest.java
2013-01-27 15:44:35 UTC (rev 9241)
+++
trunk/languagetool/languagetool-core/src/test/java/org/languagetool/tokenizers/WordTokenizerTest.java
2013-01-27 15:45:21 UTC (rev 9242)
@@ -26,7 +26,7 @@
public class WordTokenizerTest extends TestCase {
public void testTokenize() {
- WordTokenizer wordTokenizer = new WordTokenizer();
+ final WordTokenizer wordTokenizer = new WordTokenizer();
List <String> testList = wordTokenizer.tokenize("This is\u00A0a test");
assertEquals(testList.size(), 7);
assertEquals("[This, , is, \u00A0, a, , test]", testList.toString());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnnow-d2d
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
