Revision: 7050
http://languagetool.svn.sourceforge.net/languagetool/?rev=7050&view=rev
Author: milek_pl
Date: 2012-05-24 15:56:57 +0000 (Thu, 24 May 2012)
Log Message:
-----------
Do not ignore -d and -e during profiling
Modified Paths:
--------------
trunk/JLanguageTool/CHANGES.txt
trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
trunk/JLanguageTool/src/java/org/languagetool/Main.java
trunk/JLanguageTool/src/java/org/languagetool/tools/Tools.java
Modified: trunk/JLanguageTool/CHANGES.txt
===================================================================
--- trunk/JLanguageTool/CHANGES.txt 2012-05-24 13:54:16 UTC (rev 7049)
+++ trunk/JLanguageTool/CHANGES.txt 2012-05-24 15:56:57 UTC (rev 7050)
@@ -60,6 +60,9 @@
-Improved startup speed (Jarek Lipski)
-Overlapping rule matches are filtered now so that only the first match per
<rulegroup> is kept
+
+ -In the profiling rules' mode on the command-line, you can now enable
+ and disable rules.
1.7 (2012-03-25)
Modified: trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2012-05-24 13:54:16 UTC (rev 7049)
+++ trunk/JLanguageTool/src/java/org/languagetool/JLanguageTool.java
2012-05-24 15:56:57 UTC (rev 7050)
@@ -784,6 +784,30 @@
}
return rules;
}
+
+ /**
+ * Get all active (not disabled)
+ * rules for the current language that are built-in or that have been
+ * added using {@link #addRule(Rule)}.
+ * @return a List of {@link Rule} objects
+ */
+ public List<Rule> getAllActiveRules() {
+ final List<Rule> rules = new ArrayList<Rule>();
+ final List<Rule> rulesActive = new ArrayList<Rule>();
+ rules.addAll(builtinRules);
+ rules.addAll(userRules);
+ // Some rules have an internal state so they can do checks over sentence
+ // boundaries. These need to be reset so the checks don't suddenly
+ // work on different texts with the same data. However, it could be useful
+ // to keep the state information if we're checking a continuous text.
+ for (final Rule rule : rules) {
+ rule.reset();
+ if (!disabledRules.contains(rule.getId())) {
+ rulesActive.add(rule);
+ }
+ }
+ return rulesActive;
+ }
/**
* Number of sentences the latest call to check() has checked.
Modified: trunk/JLanguageTool/src/java/org/languagetool/Main.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-05-24
13:54:16 UTC (rev 7049)
+++ trunk/JLanguageTool/src/java/org/languagetool/Main.java 2012-05-24
15:56:57 UTC (rev 7050)
@@ -209,7 +209,7 @@
}
}
int runCount = 1;
- final List<Rule> rules = lt.getAllRules();
+ final List<Rule> rules = lt.getAllActiveRules();
if (profileRules) {
System.out.printf("Testing %d rules\n", rules.size());
System.out.println("Rule ID\tTime\tSentences\tMatches\tSentences per
sec.");
Modified: trunk/JLanguageTool/src/java/org/languagetool/tools/Tools.java
===================================================================
--- trunk/JLanguageTool/src/java/org/languagetool/tools/Tools.java
2012-05-24 13:54:16 UTC (rev 7049)
+++ trunk/JLanguageTool/src/java/org/languagetool/tools/Tools.java
2012-05-24 15:56:57 UTC (rev 7050)
@@ -416,7 +416,7 @@
public static void profileRulesOnText(final String contents,
final JLanguageTool lt) throws IOException {
final long[] workTime = new long[10];
- final List<Rule> rules = lt.getAllRules();
+ final List<Rule> rules = lt.getAllActiveRules();
final int ruleCount = rules.size();
System.out.printf("Testing %d rules\n", ruleCount);
System.out.println("Rule ID\tTime\tSentences\tMatches\tSentences per
sec.");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Languagetool-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/languagetool-cvs
