Changeset 86

Show
Ignore:
Timestamp:
02/07/07 00:01:07 (2 years ago)
Author:
chris
Message:

Revert the last change (mirroring) as it seems to be unnecessary

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • lex/trunk/src/com/qwirx/lex/lexicon/ThematicRelation.java

    r83 r86  
    160160    } 
    161161     
    162     private static final ThematicRelation[] m_relationsBase =  
     162    private static final ThematicRelation[] m_relations =  
    163163        new ThematicRelation[] { 
    164164        new ThematicRelation("STA-ind", "<x> is",            "broken",  
     
    207207            Arguments.XY, Theme.USER, Theme.IMPLEMENT), 
    208208    }; 
    209     private static ThematicRelation[] m_relations;  
    210209     
    211210    private static final Map m_relationNameMap = new Hashtable(); 
     
    213212    static 
    214213    { 
     214        /* 
    215215        List relations = new ArrayList(); 
    216216         
     
    269269            m_relations[i] = (ThematicRelation)relations.get(i); 
    270270        } 
     271        */ 
    271272         
    272273        for (int i = 0; i < m_relations.length; i++) 
  • lex/trunk/test/com/qwirx/lex/ThematicRelationTest.java

    r84 r86  
    3434        ThematicRelation[] rels = ThematicRelation.list(); 
    3535         
    36         assertEquals(new ThematicRelation("STA-ind-x",  
     36        assertEquals(new ThematicRelation("STA-ind",  
    3737            "<x> is", "broken", Arguments.X, Theme.PATIENT), rels[0]); 
    3838 
    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]); 
    4441         
    45         assertEquals(new ThematicRelation("STA-loc-yx", "<y> is at <x>",  
    46             "be-LOC", Arguments.YX, Theme.LOCATION, Theme.THEME), rels[5]); 
    47  
    4842        /* 
    4943        new ThematicRelation("STA-xst", "<x> exists",        "exist",