Changeset 86
- Timestamp:
- 02/07/07 00:01:07 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
lex/trunk/src/com/qwirx/lex/lexicon/ThematicRelation.java
r83 r86 160 160 } 161 161 162 private static final ThematicRelation[] m_relations Base=162 private static final ThematicRelation[] m_relations = 163 163 new ThematicRelation[] { 164 164 new ThematicRelation("STA-ind", "<x> is", "broken", … … 207 207 Arguments.XY, Theme.USER, Theme.IMPLEMENT), 208 208 }; 209 private static ThematicRelation[] m_relations;210 209 211 210 private static final Map m_relationNameMap = new Hashtable(); … … 213 212 static 214 213 { 214 /* 215 215 List relations = new ArrayList(); 216 216 … … 269 269 m_relations[i] = (ThematicRelation)relations.get(i); 270 270 } 271 */ 271 272 272 273 for (int i = 0; i < m_relations.length; i++) lex/trunk/test/com/qwirx/lex/ThematicRelationTest.java
r84 r86 34 34 ThematicRelation[] rels = ThematicRelation.list(); 35 35 36 assertEquals(new ThematicRelation("STA-ind -x",36 assertEquals(new ThematicRelation("STA-ind", 37 37 "<x> is", "broken", Arguments.X, Theme.PATIENT), rels[0]); 38 38 39 assertEquals(new ThematicRelation("STA-ind-y", 40 "<y> is", "broken", Arguments.Y, Theme.PATIENT), rels[1]); 41 42 assertEquals(new ThematicRelation("STA-loc-xy", "<x> is at <y>", 43 "be-LOC", Arguments.XY, Theme.LOCATION, Theme.THEME), rels[4]); 39 assertEquals(new ThematicRelation("STA-loc", "<x> is at <y>", 40 "be-LOC", Arguments.XY, Theme.LOCATION, Theme.THEME), rels[2]); 44 41 45 assertEquals(new ThematicRelation("STA-loc-yx", "<y> is at <x>",46 "be-LOC", Arguments.YX, Theme.LOCATION, Theme.THEME), rels[5]);47 48 42 /* 49 43 new ThematicRelation("STA-xst", "<x> exists", "exist",
