Revision: 6691
http://languagetool.svn.sourceforge.net/languagetool/?rev=6691&view=rev
Author: gulp21-1
Date: 2012-04-06 08:49:30 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
[ltdiff] moved to src/dev/tools/ltdiff
java code style improvements
ltdiff.bash:
folder name contains version number
support comparing to trunk
Modified Paths:
--------------
trunk/JLanguageTool/ltdiff/de.txt
trunk/JLanguageTool/ltdiff/en.txt
trunk/JLanguageTool/ltdiff/gen.txt
trunk/JLanguageTool/ltdiff/ltdiff.bash
trunk/JLanguageTool/ltdiff/ltdiff.java
Removed Paths:
-------------
trunk/JLanguageTool/ltdiff/ltdiff$1.class
trunk/JLanguageTool/ltdiff/ltdiff$2.class
Modified: trunk/JLanguageTool/ltdiff/de.txt
===================================================================
--- trunk/JLanguageTool/ltdiff/de.txt 2012-04-06 00:30:26 UTC (rev 6690)
+++ trunk/JLanguageTool/ltdiff/de.txt 2012-04-06 08:49:30 UTC (rev 6691)
@@ -1,5 +1,5 @@
LanguageTool - Änderungen für Deutsch
-Die folgenden Änderungen wurden für Deutsch in der neuesten Version von
LanguageTool gemacht (nur xml-basierte Regeln):
+Die folgenden Änderungen wurden für Deutsch in der Version 0VERSION von
LanguageTool gemacht (nur xml-basierte Regeln):
Keine neuen Regeln wurden hinzugefügt und keine Regeln wurden enternt.
NEUE REGEL
ENTFERNTE REGEL
Modified: trunk/JLanguageTool/ltdiff/en.txt
===================================================================
--- trunk/JLanguageTool/ltdiff/en.txt 2012-04-06 00:30:26 UTC (rev 6690)
+++ trunk/JLanguageTool/ltdiff/en.txt 2012-04-06 08:49:30 UTC (rev 6691)
@@ -1,5 +1,5 @@
LanguageTool - Changes for English
-The following changes have been done for English in the latest version of
LanguageTool (xml-based rules only):
+The following changes have been done for English in version 0VERSION of
LanguageTool (xml-based rules only):
No new rules have been added and no rules have been removed.
NEW RULE
REMOVED RULE
Modified: trunk/JLanguageTool/ltdiff/gen.txt
===================================================================
--- trunk/JLanguageTool/ltdiff/gen.txt 2012-04-06 00:30:26 UTC (rev 6690)
+++ trunk/JLanguageTool/ltdiff/gen.txt 2012-04-06 08:49:30 UTC (rev 6691)
@@ -1,5 +1,5 @@
LanguageTool - Changes
-The following changes have been done in the latest version of LanguageTool
(xml-based rules only):
+The following changes have been done in version 0VERSION of LanguageTool
(xml-based rules only):
No new rules have been added and no rules have been removed.
NEW RULE
REMOVED RULE
Deleted: trunk/JLanguageTool/ltdiff/ltdiff$1.class
===================================================================
(Binary files differ)
Deleted: trunk/JLanguageTool/ltdiff/ltdiff$2.class
===================================================================
(Binary files differ)
Modified: trunk/JLanguageTool/ltdiff/ltdiff.bash
===================================================================
--- trunk/JLanguageTool/ltdiff/ltdiff.bash 2012-04-06 00:30:26 UTC (rev
6690)
+++ trunk/JLanguageTool/ltdiff/ltdiff.bash 2012-04-06 08:49:30 UTC (rev
6691)
@@ -2,9 +2,16 @@
if [ ! $# -eq 2 ]; then
echo Usage: ./ltdiff.bash old_branch new_branch
echo e.g. ./ltdiff.bash V_1_6 V_1_7
+ echo " ./ltdiff.bash V_1_7 trunk"
exit -1
fi
+path_old="http://languagetool.svn.sourceforge.net/viewvc/languagetool/branches/$1/src/rules";
+if [ $2 == "trunk" ]; then
+
path_new="http://languagetool.svn.sourceforge.net/viewvc/languagetool/trunk/JLanguageTool/src/rules";
+else
+
path_new="http://languagetool.svn.sourceforge.net/viewvc/languagetool/branches/$2/src/rules";
+fi
javac ltdiff.java -Xlint:deprecation
@@ -16,6 +23,8 @@
oldv=`echo $1 | sed "s/_/./g" | sed "s/V.//g"`
newv=`echo $2 | sed "s/_/./g" | sed "s/V.//g"`
+folder=${1}_to_${2}
+
i=1
while read line
do
@@ -23,21 +32,21 @@
i=$((i+1));
done<gen.txt
-cat changes_a.html | sed "s/1title/${string[1]}/g" | sed
"s/2intro/${string[2]}/g" | sed "s/3nothing/${string[3]}/g" > changes.html
+cat changes_a.html | sed "s/1title/${string[1]}/g" | sed
"s/2intro/${string[2]}/g" | sed "s/3nothing/${string[3]}/g" | sed
"s/0VERSION/$newv/g" > changes.html
-rm -r changes~
-mv changes changes~
-mkdir changes
+rm -r $folder~
+mv $folder $folder~
+mkdir $folder
-for l in `ls -d ../src/rules/*/ -l | awk -F / '{print $(NF-1)}'`
+for l in `ls -d ../../../rules/*/ -l | awk -F / '{print $(NF-1)}'`
# for l in de en
do
echo $(tput setaf 2)------------------
echo $l
echo ------------------$(tput sgr0)
- wget
http://languagetool.svn.sourceforge.net/viewvc/languagetool/branches/$1/src/rules/$l/grammar.xml
-O old
- wget
http://languagetool.svn.sourceforge.net/viewvc/languagetool/branches/$2/src/rules/$l/grammar.xml
-O new
+ wget $path_old/$l/grammar.xml -O old
+ wget $path_new/$l/grammar.xml -O new
# remove xml comments
gawk -v RS='<!--|-->' 'NR%2' old > old~
@@ -45,7 +54,7 @@
mv old~ old
mv new~ new
- java ltdiff $l
+ java VersionDiffGenerator $l
# read translated strings
i=1
@@ -66,7 +75,7 @@
improved_count=`grep "6IMPROVEDRULE" changes_$l.html | wc -l`
mv changes_$l.html changes_$l.html~
- cat changes_a.html | sed "s/1title/${string[1]}/g" | sed
"s/2intro/${string[2]}/g" | sed "s/3nothing/${string[3]}/g" > changes_$l.html
+ cat changes_a.html | sed "s/1title/${string[1]}/g" | sed
"s/2intro/${string[2]}/g" | sed "s/3nothing/${string[3]}/g" | sed
"s/0VERSION/$newv/g" > changes_$l.html
cat changes_$l.html~ | sed "s/4NEWRULE/${string[4]}/g" | sed
"s/5REMOVEDRULE/${string[5]}/g" | sed "s/6IMPROVEDRULE/${string[6]}/g" | sed
"s/7FINDERR/${string[7]}/g" | sed "s/8FINDNOTERR/${string[8]}/g" >>
changes_$l.html
cat changes_b.html >> changes_$l.html
@@ -85,12 +94,12 @@
rm old
rm new
- mv changes_$l.html changes
+ mv changes_$l.html $folder
done
cat changes_b.html | sed "s\</div>\</div><div class=\"gray\">new: The rule did
not exist in version $oldv, but does in version $newv. Examples of errors which
the new rule can detect are shown while hovering over its name.<br/>improved:
The rule in version $newv has more examples than the rule in version $oldv. The
new examples are shown while hovering over the name of the rule.<br>removed:
The rule did exist in version $oldv, but does not exist in version $newv.
Usually this means that the error is now detected by a more general
rule.</div>\g" >> changes.html
-mv changes.html changes/index.html
-cp ltdiff.css changes
+mv changes.html $folder/index.html
+cp ltdiff.css $folder
exit 0
Modified: trunk/JLanguageTool/ltdiff/ltdiff.java
===================================================================
--- trunk/JLanguageTool/ltdiff/ltdiff.java 2012-04-06 00:30:26 UTC (rev
6690)
+++ trunk/JLanguageTool/ltdiff/ltdiff.java 2012-04-06 08:49:30 UTC (rev
6691)
@@ -10,9 +10,9 @@
import java.util.Collections;
import java.util.Comparator;
-class rule implements Comparable<rule> {
+class Rule implements Comparable<Rule> {
public String id;
- public String name;
+ public String name="";
public ArrayList<String> correct = new ArrayList<String>();
public ArrayList<String> incorrect = new ArrayList<String>();
@@ -41,26 +41,26 @@
}
@Override
- public int compareTo(rule r) {
+ public int compareTo(Rule r) {
return this.name.compareTo(r.name);
}
}
-public class ltdiff {
+class VersionDiffGenerator {
public static void main(String[] args) {
String lang = args[0];
- ArrayList<rule> old_rules = new ArrayList<rule>(); // rules in old
grammar.xml
- ArrayList<rule> new_rules = new ArrayList<rule>(); // rules in new
grammar.xml
- ArrayList<rule> modified_rules = new ArrayList<rule>();
+ ArrayList<Rule> old_rules = new ArrayList<Rule>(); // rules in old
grammar.xml
+ ArrayList<Rule> new_rules = new ArrayList<Rule>(); // rules in new
grammar.xml
+ ArrayList<Rule> modified_rules = new ArrayList<Rule>();
try {
for (int i=0; i<2; i++) {
- ArrayList<rule> rules;
+ ArrayList<Rule> rules;
if(i==0)
rules = old_rules;
@@ -70,7 +70,7 @@
BufferedReader in = new BufferedReader(new FileReader(i==0 ? "old" :
"new"));
String line;
- rule r = new rule();
+ Rule r = new Rule();
// loop through all lines
while ((line = in.readLine()) != null) {
@@ -80,16 +80,16 @@
if (!line.contains("name=\"")) // merge with the following line if
the name is there (e.g. sk)
line += in.readLine();
- if (r.correct.size() > 0) {
+ if (r.numberOfExamples() > 0) {
rules.add(r);
- r = new rule();
+ r = new Rule();
}
r.id = line;
r.name = line;
r.id = r.id.replaceAll(".*id=\"","").replaceAll("\".*","");
- r.name= r.name.replaceAll(".*name=\"","").replaceAll("\".*","");
+ r.name = r.name.replaceAll(".*name=\"","").replaceAll("\".*","");
for (int j = 0; j < rules.size(); j++) { // ensure that the name
is unique
if (r.name.equals(rules.get(j).name)) {
@@ -144,7 +144,7 @@
if (new_rules.get(i).numberOfExamples() >
old_rules.get(j).numberOfExamples()) { // if the new rules has more examples,
it is considered to be improved
- rule r = new_rules.get(i);
+ Rule r = new_rules.get(i);
for (int k = 0; k < r.correct.size(); k++) { // remove examples
which already exist in old rule
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
For Developers, A Lot Can Happen In A Second.
Boundary is the first to Know...and Tell You.
Monitor Your Applications in Ultra-Fine Resolution. Try it FREE!
http://p.sf.net/sfu/Boundary-d2dvs2
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
