Revision: 16971
http://sourceforge.net/p/gate/code/16971
Author: ian_roberts
Date: 2013-10-03 11:24:25 +0000 (Thu, 03 Oct 2013)
Log Message:
-----------
Changed all uses of annotations to inputAS or outputAS as appropriate.
Modified Paths:
--------------
gate/trunk/plugins/Lang_Russian/resources/grammar/clean.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/date_pre.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/final.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/firstname.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/gazlocation.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/loc_context.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/name.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/name_context.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/name_post.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/person.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/reldate.jape
gate/trunk/plugins/Lang_Russian/resources/grammar/spuriousname.jape
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/clean.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/clean.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/clean.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -39,6 +39,6 @@
-->
{
gate.AnnotationSet temp = (gate.AnnotationSet)bindings.get("temp");
- annotations.removeAll(temp);
+ inputAS.removeAll(temp);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/date_pre.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/date_pre.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/date_pre.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -72,9 +72,9 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", personAnn.getFeatures().get("rule"));
features.put("rule2", "PersonDateAmbig");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/final.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/final.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/final.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -52,9 +52,9 @@
}
features.put("rule1", person1Ann.getFeatures().get("rule"));
features.put("rule", "PersonFinal");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "Person",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "Person",
features);
-annotations.removeAll(personSet);
+inputAS.removeAll(personSet);
}
@@ -89,9 +89,9 @@
features.put("orgType", orgAnn.getFeatures().get("orgType"));
features.put("rule1", orgAnn.getFeatures().get("rule"));
features.put("rule2", "OrgCountryFinal");
-annotations.add(org.firstNode(), org.lastNode(), "Organization",
+outputAS.add(org.firstNode(), org.lastNode(), "Organization",
features);
-annotations.removeAll(org);
+inputAS.removeAll(org);
}
@@ -113,9 +113,9 @@
features.put("orgType", orgAnn.getFeatures().get("orgType"));
features.put("rule1", orgAnn.getFeatures().get("rule"));
features.put("rule2", "OrgFinal");
-annotations.add(org.firstNode(), org.lastNode(), "Organization",
+outputAS.add(org.firstNode(), org.lastNode(), "Organization",
features);
-annotations.removeAll(org);
+inputAS.removeAll(org);
}
@@ -138,9 +138,9 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", locAnn.getFeatures().get("rule"));
features.put("rule2", "PersonLocFinal");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
@@ -160,9 +160,9 @@
features.put("locType",locAnn.getFeatures().get("locType"));
features.put("rule1", locAnn.getFeatures().get("rule"));
features.put("rule2", "LocFinal");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
@@ -194,9 +194,9 @@
//features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "DateTimeFinal");
features.put("kind", "dateTime");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -217,9 +217,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "SeasonYearFinal");
features.put("kind", "date");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -243,9 +243,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "DateYearFinal");
features.put("kind", "date");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -270,9 +270,9 @@
//features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "TimeDateFinal");
features.put("kind", "dateTime");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -296,9 +296,9 @@
//features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "TimeYearFinal");
features.put("kind", "dateTime");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -320,9 +320,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "DateOnlyFinal");
features.put("kind", "date");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
//fix this later
@@ -347,9 +347,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule", "TimeContextFinal");
features.put("kind", "date");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
//removes TempTime annotation, gets the rule feature and adds a new Date
annotation
gate.AnnotationSet time = (gate.AnnotationSet)bindings.get("time");
gate.Annotation timeAnn = (gate.Annotation)time.iterator().next();
@@ -357,9 +357,9 @@
features2.put("rule1", timeAnn.getFeatures().get("rule"));
features2.put("rule", "TimeContextFinal");
features2.put("kind", "time");
-annotations.add(time.firstNode(), date.lastNode(), "Date",
+outputAS.add(time.firstNode(), date.lastNode(), "Date",
features2);
-annotations.removeAll(time);
+inputAS.removeAll(time);
}
@@ -382,9 +382,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "TimeWordsContextFinal");
features.put("kind", "time");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -403,9 +403,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "YearOnlyFinal");
features.put("kind", "date");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -425,9 +425,9 @@
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "TimeOnlyFinal");
features.put("kind", "time");
-annotations.add(date.firstNode(), date.lastNode(), "Date",
+outputAS.add(date.firstNode(), date.lastNode(), "Date",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
@@ -454,9 +454,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "AddressFull");
features.put("kind", "complete");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -475,9 +475,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "EmailFinal");
features.put("kind", "email");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -496,9 +496,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "PhoneFinal");
features.put("kind", "phone");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -517,9 +517,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "PostcodeFinal");
features.put("kind", "postcode");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -538,9 +538,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "IpFinal");
features.put("kind", "ip");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -559,9 +559,9 @@
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "UrlFinal");
features.put("kind", "url");
-annotations.add(address.firstNode(), address.lastNode(), "Address",
+outputAS.add(address.firstNode(), address.lastNode(), "Address",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
@@ -580,9 +580,9 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", addressAnn.getFeatures().get("rule"));
features.put("rule2", "StreetFinal");
-annotations.add(address.firstNode(), address.lastNode(), "Location",
+outputAS.add(address.firstNode(), address.lastNode(), "Location",
features);
-annotations.removeAll(address);
+inputAS.removeAll(address);
}
////////////////////////////////////////////////////////////
@@ -603,9 +603,9 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", identAnn.getFeatures().get("rule"));
features.put("rule2", "IdentifierFinal");
-annotations.add(ident.firstNode(), ident.lastNode(), "Identifier",
+outputAS.add(ident.firstNode(), ident.lastNode(), "Identifier",
features);
-annotations.removeAll(ident);
+inputAS.removeAll(ident);
}
@@ -623,7 +623,7 @@
//removes TempSpecs annotation
gate.AnnotationSet spec = (gate.AnnotationSet)bindings.get("spec");
//gate.FeatureMap features = Factory.newFeatureMap();
-annotations.removeAll(spec);
+inputAS.removeAll(spec);
}
//////////////////////////////////////////////////////
@@ -653,8 +653,8 @@
//features.put("gender", personAnn.getFeatures().get("gender"));
//features.put("rule1", personAnn.getFeatures().get("rule"));
//features.put("rule2", "UnknownPerson");
-//annotations.add(person.firstNode(), person.lastNode(), "Person",features);
-//annotations.removeAll(person);
+//outputAS.add(person.firstNode(), person.lastNode(), "Person",features);
+//inputAS.removeAll(person);
//}
Rule: FacilityFinal
@@ -671,7 +671,7 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", facAnn.getFeatures().get("rule"));
features.put("rule2", "FacilityFinal");
-annotations.add(fac.firstNode(), fac.lastNode(), "Location",
+outputAS.add(fac.firstNode(), fac.lastNode(), "Location",
features);
-//annotations.removeAll(fac);
+//inputAS.removeAll(fac);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/firstname.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/firstname.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/firstname.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -33,7 +33,7 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("gender", personAnn.getFeatures().get("minorType"));
features.put("rule", "FirstName");
-annotations.add(person.firstNode(), person.lastNode(), "FirstPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "FirstPerson",
features);
}
@@ -52,7 +52,7 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("gender", personAnn.getFeatures().get("minorType"));
features.put("rule", "TitleGender");
-annotations.add(person.firstNode(), person.lastNode(), "Title",
+outputAS.add(person.firstNode(), person.lastNode(), "Title",
features);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/gazlocation.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/gazlocation.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/gazlocation.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -52,9 +52,9 @@
// create some new features
features.put("rule", "GazLocation");
// create a GazLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "GazLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "GazLocation",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/loc_context.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/loc_context.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/loc_context.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -35,9 +35,9 @@
gate.AnnotationSet loc = (gate.AnnotationSet) bindings.get("loc");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule ", "LocConjLoc1");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
@@ -58,9 +58,9 @@
gate.AnnotationSet loc = (gate.AnnotationSet) bindings.get("loc");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule ", "LocConjLoc2");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
@@ -83,9 +83,9 @@
gate.AnnotationSet loc = (gate.AnnotationSet) bindings.get("loc");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule ", "UnknownLocRegion");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
@@ -105,9 +105,9 @@
gate.AnnotationSet loc = (gate.AnnotationSet) bindings.get("loc");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule ", "InLoc");
-annotations.add(loc.firstNode(), loc.lastNode(), "Location",
+outputAS.add(loc.firstNode(), loc.lastNode(), "Location",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/name.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/name.jape 2013-10-03
09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/name.jape 2013-10-03
11:24:25 UTC (rev 16971)
@@ -88,11 +88,11 @@
// create some new features
features.put("rule", "GazOrganization");
// create a TempOrg annotation and add the features we've created
-annotations.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
+outputAS.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
features);
// get spurious bit
//gate.AnnotationSet spurSet = (gate.AnnotationSet)bindings.get("orgSpur");
-//annotations.removeAll(spurSet);
+//inputAS.removeAll(spurSet);
}
Rule: GazOrgJobTitle
@@ -126,7 +126,7 @@
// create some new features
features.put("rule", "GazOrgJobTitle");
// create a TempOrg annotation and add the features we've created
-annotations.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
+outputAS.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
features);
}
@@ -174,9 +174,9 @@
gate.AnnotationSet orgSet = (gate.AnnotationSet)bindings.get("orgName");
features.put("orgType", "team");
features.put("rule", "SportsteamPost");
-annotations.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
+outputAS.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
features);
-annotations.removeAll(orgSet);
+inputAS.removeAll(orgSet);
}
@@ -195,7 +195,7 @@
gate.FeatureMap features = Factory.newFeatureMap();
// create an annotation set consisting of all the annotations for orgName
gate.AnnotationSet orgSet = (gate.AnnotationSet)bindings.get("orgName");
- annotations.removeAll(orgSet);
+ inputAS.removeAll(orgSet);
}
Rule: TheOrgXandY
@@ -266,9 +266,9 @@
gate.AnnotationSet orgSet = (gate.AnnotationSet)bindings.get("orgName");
features.put("orgType", "Unknown");
features.put("rule", "LocUni");
-annotations.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
+outputAS.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
features);
-annotations.removeAll(orgSet);
+inputAS.removeAll(orgSet);
}
@@ -731,7 +731,7 @@
gate.Annotation locAnn = (gate.Annotation)loc.iterator().next();
//propagate minorType feature (and value) from Lookup
features.put("locType", locAnn.getFeatures().get("minorType"));
- annotations.removeAll(loc);
+ inputAS.removeAll(loc);
}
else
{
@@ -739,12 +739,12 @@
gate.AnnotationSet gpe = (gate.AnnotationSet)locSet.get("GazLocation");
gate.Annotation gpeAnn = (gate.Annotation) gpe.iterator().next();
features.put("locType", gpeAnn.getFeatures().get("locType"));
-annotations.removeAll(gpe);
+inputAS.removeAll(gpe);
}
// create some new features
features.put("rule", "Location1");
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
}
@@ -774,9 +774,9 @@
features.put("rule", "Location2");
features.put("locType", "Unknown");
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
-annotations.removeAll(locSet);
+inputAS.removeAll(locSet);
}
@@ -812,7 +812,7 @@
// create some new features
features.put("rule", "LocationPre");
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
}
@@ -849,9 +849,9 @@
// create some new features
features.put("rule", "LocationPreLower");
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
-annotations.removeAll(locSet);
+inputAS.removeAll(locSet);
}
//note this isn't implemented because it depends whether the
@@ -873,7 +873,7 @@
//{
// gate.FeatureMap features = Factory.newFeatureMap();
// gate.AnnotationSet fooSet = (gate.AnnotationSet)bindings.get("foo");
-// annotations.removeAll(fooSet);
+// inputAS.removeAll(fooSet);
//}
Rule: GazLocation
@@ -904,9 +904,9 @@
// create some new features
features.put("rule", "GazLocation");
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
-annotations.removeAll(locSet);
+inputAS.removeAll(locSet);
}
Rule: GPEPost
@@ -1029,9 +1029,9 @@
// create some new features
features.put("rule", "GazFacility");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
@@ -1058,9 +1058,9 @@
// create some new features
features.put("rule", "LocFacility");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
Rule: Facility1
@@ -1086,9 +1086,9 @@
// create some new features
features.put("rule", "Facility1");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
Rule: Facility2
@@ -1109,9 +1109,9 @@
// create some new features
features.put("rule", "Facility2");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
@@ -1138,9 +1138,9 @@
// create some new features
features.put("rule", "FacilityExt");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
@@ -1167,9 +1167,9 @@
// create some new features
features.put("rule", "FacilityExt2");
// create a TempFac annotation and add the features we've created
-annotations.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
+outputAS.add(facSet.firstNode(), facSet.lastNode(), "TempFacility",
features);
-annotations.removeAll(facSet);
+inputAS.removeAll(facSet);
}
*/
@@ -1204,7 +1204,7 @@
features.put("kind", "personName");
features.put("rule", "CountryPerson");
features.put("GENERIC", "TRUE");
-annotations.add(person.firstNode(), person.lastNode(), "GPE",
+outputAS.add(person.firstNode(), person.lastNode(), "GPE",
features);
}
@@ -1227,7 +1227,7 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("kind", "personName");
features.put("rule", "CountryPerson");
-annotations.add(person.firstNode(), person.lastNode(), "GPE",
+outputAS.add(person.firstNode(), person.lastNode(), "GPE",
features);
}
@@ -1274,16 +1274,16 @@
features.put("locType", locAnn.getFeatures().get("locType"));
features.put("rule", "LocOrgXBase");
}
- annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+ outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
-annotations.removeAll(loc);
+inputAS.removeAll(loc);
// now process Organization
gate.AnnotationSet orgSet = (gate.AnnotationSet)bindings.get("orgName");
features.put("orgType", "Unknown");
features.put("rule", "LocOrgXBase");
-annotations.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
+outputAS.add(orgSet.firstNode(), orgSet.lastNode(), "TempOrganization",
features);
-annotations.removeAll(orgSet);
+inputAS.removeAll(orgSet);
}
*/
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/name_context.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/name_context.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/name_context.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -33,9 +33,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "JobTitle1");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: Jobtitle2
@@ -58,9 +58,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "JobTitle2");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: PersonJobtitle2
@@ -83,9 +83,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonJobTitle2");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule:PersonTitle1
@@ -101,9 +101,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonTitle1");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule:PersonUnknown
@@ -119,9 +119,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonUnknown");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
@@ -174,9 +174,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonConjPerson");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: PersonConjPerson2
@@ -196,9 +196,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonConjPerson");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
@@ -232,9 +232,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonAge");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: PersonSays
@@ -254,9 +254,9 @@
gate.AnnotationSet person = (gate.AnnotationSet) bindings.get("person");
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule", "PersonSays");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: NotSpeaker
@@ -291,9 +291,9 @@
features.put("kind", "personName");
features.put("confidence", "20");
features.put("rule", "SpeakerStop");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: Speaker
@@ -313,9 +313,9 @@
features.put("kind", "personName");
features.put("confidence", "20");
features.put("rule", "Speaker");
-annotations.add(person.firstNode(), person.lastNode(), "Person",
+outputAS.add(person.firstNode(), person.lastNode(), "Person",
features);
-annotations.removeAll(person);
+inputAS.removeAll(person);
}
Rule: Speaker2
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/name_post.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/name_post.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/name_post.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -42,7 +42,7 @@
// get the TempOrganization annotation (previously assigned)
gate.AnnotationSet orgSet =
-annotations.get("TempOrganization",personSet.firstNode().getOffset(),
+inputAS.get("TempOrganization",personSet.firstNode().getOffset(),
personSet.lastNode().getOffset());
// and if it's empty
if (orgSet.size()==0)
@@ -55,7 +55,7 @@
}
features.put("kind", "personName");
features.put("rule", "FirstPersonStop");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/person.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/person.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/person.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -138,7 +138,7 @@
Double num = new Double((double)50);
features.put("confidence", num);
features.put("rule", "GazPerson");
-annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
features);
}
@@ -166,13 +166,13 @@
Double num = new Double((double)100);
features.put("confidence", num);
features.put("rule", "OrganizationThenPerson");
-annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
features);
gate.AnnotationSet loc = (gate.AnnotationSet)bindings.get("loc");
gate.Annotation locAnn = (gate.Annotation)loc.iterator().next();
features.put("kind", "locNearPerson");
-annotations.add(loc.firstNode(), loc.lastNode(), "TempLocation",
+outputAS.add(loc.firstNode(), loc.lastNode(), "TempLocation",
features);
} // LocationThenPerson
@@ -202,13 +202,13 @@
//Double num = new Double((double)100);
//features.put("confidence", num);
//features.put("rule", "OrganizationThenPerson");
-//annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+//outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
//features);
//
//gate.AnnotationSet org = (gate.AnnotationSet)bindings.get("org");
//gate.Annotation orgAnn = (gate.Annotation)org.iterator().next();
//features.put("kind", "orgNearPerson");
-//annotations.add(org.firstNode(), org.lastNode(), "TempOrganization",
+//outputAS.add(org.firstNode(), org.lastNode(), "TempOrganization",
//features);
//} // OrganizationThenPerson
@@ -229,7 +229,7 @@
Double num = new Double((double)40);
features.put("confidence", num);
features.put("rule", "GazPersonSurname");
-annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
features);
}
@@ -274,9 +274,9 @@
Double num = new Double((double)20);
features.put("confidence", num);
features.put("rule", "GazPersonFirst");
-annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
features);
-//annotations.removeAll(person);
+//inputAS.removeAll(person);
}
@@ -307,7 +307,7 @@
Double num = new Double((double)40);
features.put("confidence", num);
features.put("rule", "PersonFirstContext2");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -386,7 +386,7 @@
Double num = new Double((double)35);
features.put("confidence", num);
features.put("rule", "PersonTitle");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -416,7 +416,7 @@
Double num = new Double((double)55);
features.put("confidence", num);
features.put("rule", "PersonFirstTitleGender");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -454,7 +454,7 @@
features.put("confidence", num);
features.put("rule", "PersonTitleGender");
// create a TempPerson annotation and add the features we've created
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -493,7 +493,7 @@
features.put("confidence", num);
features.put("rule", "PersonJobTitle");
// create a TempPerson annotation and add the features we've created
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -538,7 +538,7 @@
Double num = new Double((double)20);
features.put("confidence", num);
features.put("rule", "FirstPersonStop");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -595,7 +595,7 @@
Double num = new Double((double)51);
features.put("confidence", num);
features.put("rule", "TheTitlePerson");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -635,7 +635,7 @@
Double num = new Double((double)51);
features.put("confidence", num);
features.put("rule", "TheTitlePersonFull");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -674,7 +674,7 @@
Double num = new Double((double)51);
features.put("confidence", num);
features.put("rule", "OrgTitlePerson");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -696,9 +696,9 @@
Double num = new Double((double)30);
features.put("confidence", num);
features.put("rule", "LocPersonAmbig1");
-annotations.add(person.firstNode(), person.lastNode(), "TempPerson",
+outputAS.add(person.firstNode(), person.lastNode(), "TempPerson",
features);
-//annotations.removeAll(person);
+//inputAS.removeAll(person);
}
Rule: LocPersonAmbig
@@ -736,7 +736,7 @@
Double num = new Double((double)30);
features.put("confidence", num);
// create a TempLoc annotation and add the features we've created
-annotations.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
+outputAS.add(locSet.firstNode(), locSet.lastNode(), "TempLocation",
features);
}
@@ -857,7 +857,7 @@
Double num = new Double((double)10);
features.put("confidence", num);
features.put("rule", "PersonFull");
- annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
+ outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -899,7 +899,7 @@
Double num = new Double((double)10);
features.put("confidence", num);
features.put("rule", "PersonSpeaker");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -944,7 +944,7 @@
Double num = new Double((double)20);
features.put("confidence", num);
features.put("rule", "PersonFullStop");
- annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
+ outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -986,7 +986,7 @@
Double num = new Double((double)20);
features.put("confidence", num);
features.put("rule", "FirstName");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -1017,7 +1017,7 @@
Double num = new Double((double)10);
features.put("confidence", num);
features.put("rule", "PersonFullReverse");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -1045,7 +1045,7 @@
Double num = new Double((double)100);
features.put("confidence", num);
features.put("rule", "PersonSaint");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -1078,7 +1078,7 @@
Double num = new Double((double)20);
features.put("confidence", num);
features.put("rule", "PersonLocAmbig");
-annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
+outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
@@ -1120,7 +1120,7 @@
Double num = new Double((double)10);
features.put("confidence", num);
features.put("rule", "PersonAlias");
- annotations.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
+ outputAS.add(personSet.firstNode(), personSet.lastNode(), "TempPerson",
features);
}
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/reldate.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/reldate.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/reldate.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -107,9 +107,9 @@
gate.FeatureMap features = Factory.newFeatureMap();
features.put("rule1", dateAnn.getFeatures().get("rule"));
features.put("rule2", "EarlyDate");
-annotations.add(date.firstNode(), date.lastNode(), "TempDate",
+outputAS.add(date.firstNode(), date.lastNode(), "TempDate",
features);
-annotations.removeAll(date);
+inputAS.removeAll(date);
}
Rule:FiscalDate
Modified: gate/trunk/plugins/Lang_Russian/resources/grammar/spuriousname.jape
===================================================================
--- gate/trunk/plugins/Lang_Russian/resources/grammar/spuriousname.jape
2013-10-03 09:59:26 UTC (rev 16970)
+++ gate/trunk/plugins/Lang_Russian/resources/grammar/spuriousname.jape
2013-10-03 11:24:25 UTC (rev 16971)
@@ -32,9 +32,9 @@
{
gate.AnnotationSet spur = (gate.AnnotationSet) bindings.get("spur");
gate.FeatureMap features = Factory.newFeatureMap();
-annotations.add(spur.firstNode(), spur.lastNode(), "Spurious",
+outputAS.add(spur.firstNode(), spur.lastNode(), "Spurious",
features);
-annotations.removeAll(spur);
+inputAS.removeAll(spur);
}
Rule: OrgSpurPost
@@ -49,9 +49,9 @@
{
gate.AnnotationSet spur = (gate.AnnotationSet) bindings.get("spur");
gate.FeatureMap features = Factory.newFeatureMap();
-annotations.add(spur.firstNode(), spur.lastNode(), "Spurious",
+outputAS.add(spur.firstNode(), spur.lastNode(), "Spurious",
features);
-annotations.removeAll(spur);
+inputAS.removeAll(spur);
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
GATE-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gate-cvs
