Revision: 18964
http://sourceforge.net/p/gate/code/18964
Author: adamfunk
Date: 2015-10-26 08:58:17 +0000 (Mon, 26 Oct 2015)
Log Message:
-----------
need to distinguish the segments
Modified Paths:
--------------
gate/branches/termraider-segment/.settings/org.eclipse.jdt.core.prefs
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-french-gate
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-german-gate
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-spanish-gate
gate/branches/termraider-segment/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
Modified: gate/branches/termraider-segment/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- gate/branches/termraider-segment/.settings/org.eclipse.jdt.core.prefs
2015-10-26 08:49:28 UTC (rev 18963)
+++ gate/branches/termraider-segment/.settings/org.eclipse.jdt.core.prefs
2015-10-26 08:58:17 UTC (rev 18964)
@@ -117,7 +117,7 @@
org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=66
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=82
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=18
org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
@@ -132,7 +132,7 @@
org.eclipse.jdt.core.formatter.blank_lines_before_method=1
org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=0
org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
@@ -146,9 +146,9 @@
org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true
org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_header=true
org.eclipse.jdt.core.formatter.comment.format_html=true
org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
org.eclipse.jdt.core.formatter.comment.format_line_comments=true
@@ -156,8 +156,8 @@
org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not
insert
-org.eclipse.jdt.core.formatter.comment.line_length=72
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
@@ -166,7 +166,7 @@
org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
@@ -187,7 +187,7 @@
org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do
not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do
not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do
not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do
not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do
not insert
@@ -316,13 +316,13 @@
org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do
not insert
@@ -339,7 +339,7 @@
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do
not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=do not
insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do
not insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
@@ -369,7 +369,7 @@
org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
org.eclipse.jdt.core.formatter.tabulation.char=space
org.eclipse.jdt.core.formatter.tabulation.size=2
Modified:
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-french-gate
===================================================================
---
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-french-gate
2015-10-26 08:49:28 UTC (rev 18963)
+++
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-french-gate
2015-10-26 08:58:17 UTC (rev 18964)
@@ -21,8 +21,8 @@
# spaces. You should install the tree tagger in a directory that does not
# contain spaces in its path (i.e. not under "Program Files").
-BIN=/usr/local/durmtools/TreeTagger/bin
-LIB=/usr/local/durmtools/TreeTagger/lib
+BIN=/opt/adam/treetagger/bin
+LIB=/opt/adam/treetagger/lib
# set your default options for the Tree Tagger
TAGGEROPTS="-token -lemma -sgml"
Modified:
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-german-gate
===================================================================
---
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-german-gate
2015-10-26 08:49:28 UTC (rev 18963)
+++
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-german-gate
2015-10-26 08:58:17 UTC (rev 18964)
@@ -9,9 +9,9 @@
# spaces. You should install the tree tagger in a directory that does not
# contain spaces in its path (i.e. not under "Program Files").
-BIN=/usr/local/durmtools/TreeTagger/bin
-CMD=/usr/local/durmtools/TreeTagger/cmd
-LIB=/usr/local/durmtools/TreeTagger/lib
+BIN=/opt/adam/treetagger/bin
+CMD=/opt/adam/treetagger/cmd
+LIB=/opt/adam/treetagger/lib
TAGGER=${BIN}/tree-tagger
ABBR_LIST=${LIB}/german-abbreviations
Modified:
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-spanish-gate
===================================================================
---
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-spanish-gate
2015-10-26 08:49:28 UTC (rev 18963)
+++
gate/branches/termraider-segment/plugins/Tagger_Framework/resources/TreeTagger/tree-tagger-spanish-gate
2015-10-26 08:58:17 UTC (rev 18964)
@@ -9,9 +9,9 @@
# spaces. You should install the tree tagger in a directory that does not
# contain spaces in its path (i.e. not under "Program Files").
-BIN=/usr/local/durmtools/TreeTagger/bin
-CMD=/usr/local/durmtools/TreeTagger/cmd
-LIB=/usr/local/durmtools/TreeTagger/lib
+BIN=/opt/adam/treetagger/bin
+CMD=/opt/adam/treetagger/cmd
+LIB=/opt/adam/treetagger/lib
MWL=${CMD}/mwl-lookup.perl
TAGGER=${BIN}/tree-tagger
Modified:
gate/branches/termraider-segment/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
===================================================================
---
gate/branches/termraider-segment/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
2015-10-26 08:49:28 UTC (rev 18963)
+++
gate/branches/termraider-segment/plugins/TermRaider/src/gate/termraider/bank/DocumentFrequencyBank.java
2015-10-26 08:58:17 UTC (rev 18964)
@@ -151,6 +151,7 @@
for (Annotation segment : segments) {
documentCount++;
+ String documentSegmentSource = String.format("%s [%i]", documentSource,
segment.getId());
AnnotationSet localCandidates =
gate.Utils.getContainedAnnotations(candidates, segment);
Set<Term> documentTerms = new HashSet<Term>();
@@ -159,7 +160,7 @@
}
for (Term term : documentTerms) {
- Utilities.addToMapSet(termDocuments, term, documentSource);
+ Utilities.addToMapSet(termDocuments, term, documentSegmentSource);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
