Revision: 9378
http://languagetool.svn.sourceforge.net/languagetool/?rev=9378&view=rev
Author: jaumeortola
Date: 2013-02-15 18:32:06 +0000 (Fri, 15 Feb 2013)
Log Message:
-----------
[ca] Fixed false negatives with "son".
Modified Paths:
--------------
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
trunk/languagetool/languagetool-language-modules/ca/src/main/resources/org/languagetool/rules/ca/grammar.xml
trunk/languagetool/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
Modified:
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
===================================================================
---
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
2013-02-15 17:10:10 UTC (rev 9377)
+++
trunk/languagetool/languagetool-language-modules/ca/src/main/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRule.java
2013-02-15 18:32:06 UTC (rev 9378)
@@ -316,11 +316,12 @@
j++;
}
- //previous token is a
non-agreeing noun or it is adjective or adverb (not preceded my verb)
- if (!isException && (
(matchPostagRegexp(tokens[i-1],NOM) &&
!matchPostagRegexp(tokens[i-1],substPattern)) ||
- (i>3 /*&&
!matchPostagRegexp(tokens[i],NOM)*/ && ((
matchPostagRegexp(tokens[i-1],ADJECTIU) &&
!matchPostagRegexp(tokens[i-1],adjPattern) ) ||
matchPostagRegexp(tokens[i-1],ADVERBIS_ACCEPTATS) ||
matchPostagRegexp(tokens[i-1],LOC_ADV) )
-
&& !matchPostagRegexp(tokens[i-2],VERB) &&
!matchPostagRegexp(tokens[i-3],VERB)))) {
- j=1;
+ //previous token is a
non-agreeing noun or it is adjective or adverb (not preceded by verb) /*&&
!matchPostagRegexp(tokens[i],NOM)*/
+ if (!isException && ((matchPostagRegexp(tokens[i - 1], NOM) &&
!matchPostagRegexp(tokens[i - 1], substPattern))
+ || (i > 2 && ((matchPostagRegexp(tokens[i - 1], ADJECTIU) &&
!matchPostagRegexp(tokens[i - 1], adjPattern))
+ || matchPostagRegexp(tokens[i - 1],
ADVERBIS_ACCEPTATS) || matchPostagRegexp(tokens[i - 1], LOC_ADV))
+ && !matchPostagRegexp(tokens[i - 2], VERB) &&
!matchPostagRegexp(tokens[i - 3], VERB)) )) {
+ j = 1;
keepCounting=true;
while (i-j>0 &&
!adjectiveAgrees && keepCounting)
{
Modified:
trunk/languagetool/languagetool-language-modules/ca/src/main/resources/org/languagetool/rules/ca/grammar.xml
===================================================================
---
trunk/languagetool/languagetool-language-modules/ca/src/main/resources/org/languagetool/rules/ca/grammar.xml
2013-02-15 17:10:10 UTC (rev 9377)
+++
trunk/languagetool/languagetool-language-modules/ca/src/main/resources/org/languagetool/rules/ca/grammar.xml
2013-02-15 18:32:06 UTC (rev 9378)
@@ -6567,7 +6567,8 @@
</marker>
<token><exception postag="SENT_END|PUNCT.*"
postag_regexp="yes"/></token>
</pattern>
- <message>Cal escriure <suggestion><match no="1"/>
que</suggestion>. </message>
+ <message>Cal escriure <suggestion><match no="1"/>
que</suggestion>.</message>
+ <short>Diacrític</short>
<example type="incorrect" correction="ja
que"><marker>ja què</marker> són així</example>
<example type="correct">ja que</example>
</rule>
@@ -6578,9 +6579,25 @@
<token>què</token>
</pattern>
<message>Cal escriure <suggestion>tot i
que</suggestion>.</message>
+ <short>Diacrític</short>
<example type="incorrect" correction="tot i
que"><marker>tot i què</marker> no m'interessa</example>
<example type="correct">tot i que és
possible</example>
</rule>
+ <rule>
+ <pattern>
+ <token postag="V.[SI].*|_GV_" postag_regexp="yes"/>
+ <token>el</token>
+ <marker>
+ <token>què</token>
+ </marker>
+ <token postag="V.[SI].*|_GV_" postag_regexp="yes"/>
+ </pattern>
+ <message>Cal escriure: <suggestion>que</suggestion>.</message>
+ <short>Diacrític</short>
+ <example type="incorrect">per què escriuen el
<marker>què</marker> escriuen</example>
+ <example type="incorrect">per què han escrit el
<marker>què</marker> han escrit</example>
+ <example type="correct">per què van escriure el que han
escrit</example>
+ </rule>
</rulegroup>
<rulegroup id="FEU" name="feu/féu">
<!-- Cal estudiar "que el feu". Mirar que no hi hagi cap verb ni
pronom de 2P abans. "que el feu famós"... -->
@@ -6645,6 +6662,7 @@
<short>Accent diacrític.</short>
<example type="incorrect" correction="són">Novament
<marker>son</marker> casos evidents de malbaratment.</example>
<example type="incorrect" correction="són">Aquestes
<marker>son</marker> boniques.</example>
+ <example type="incorrect"
correction="Són"><marker>Son</marker> dos exemples dels centenars que
existeixen.</example>
<example type="correct">una restricció sostinguda del son de
quatre hores al dia</example>
</rule>
</rulegroup>
@@ -6774,23 +6792,6 @@
<example type="correct">perseguit de prop pels
aliats.</example>
</rule>
</rulegroup>
- <rulegroup id="QUE" name="que/què">
- <rule>
- <pattern>
- <token postag="V.[SI].*|_GV_" postag_regexp="yes"/>
- <token>el</token>
- <marker>
- <token>què</token>
- </marker>
- <token postag="V.[SI].*|_GV_" postag_regexp="yes"/>
- </pattern>
- <message>Cal escriure: <suggestion>que</suggestion>.</message>
- <short>Confusió</short>
- <example type="incorrect">per què escriuen el
<marker>què</marker> escriuen</example>
- <example type="incorrect">per què han escrit el
<marker>què</marker> han escrit</example>
- <example type="correct">per què van escriure el que han
escrit</example>
- </rule>
- </rulegroup>
<rulegroup id="FORA" name="Confusió: *fora/fóra bo/atacat">
<rule>
<pattern>
Modified:
trunk/languagetool/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
===================================================================
---
trunk/languagetool/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
2013-02-15 17:10:10 UTC (rev 9377)
+++
trunk/languagetool/languagetool-language-modules/ca/src/test/java/org/languagetool/rules/ca/ComplexAdjectiveConcordanceRuleTest.java
2013-02-15 18:32:06 UTC (rev 9378)
@@ -40,7 +40,7 @@
}
public void testRule() throws IOException {
-
+
// correct sentences:
//es van posar en camí proveïts de presents
assertCorrect("Bernabé i Saule, un cop acomplerta la seva
missió a Jerusalem");
@@ -111,6 +111,7 @@
assertCorrect("Era un home força misteriós");
// errors:
+ assertIncorrect("Son molt boniques");
assertIncorrect("La casa destrossat");
assertIncorrect("pantalons curt o llargs");
assertIncorrect("sota les grans persianes de color verd
recalcada");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Go Parallel Website, sponsored by Intel - in partnership with Geeknet,
is your hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials, tech docs,
whitepapers, evaluation guides, and opinion stories. Check out the most
recent posts - join the conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Languagetool-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-commits
