← Back to branch summary

~kenneth-arnold/openmind-commons/old

« back to all changes in this revision

Viewing changes to app/json.py

  • Committer: rspeer
  • Date: 2009-03-13 21:23:28 UTC
  • Revision ID: svn-v4:489630c3-d423-0410-a921-f37d23d5e3ee:trunk/commons:2016
back up on cnet 3.5

Show diffs side-by-side

added added

removed removed

Lines of Context:
app/json.py
111
111
    assert len(features) == 0 # FIXME: features currently not supported.
112
112
    if len(concepts) == 0:
113
113
        raise InputError(u'No concepts given.')
114
 
    from divisi.cnet import make_category
 
114
    from csamoa.conceptnet4.analogyspace import make_category
115
115
    try:
116
116
        return make_category(svd, concepts, features)
117
117
    except KeyError, e:
371
371
 
372
372
    svd = get_svd_results(lang)
373
373
 
374
 
    from divisi.cnet import eval_assertion
 
374
    from csamoa.conceptnet4.analogyspace import eval_assertion
375
375
    lval, rval = eval_assertion(svd, relationtype=reltype, ltext=c1.text, rtext=c2.text)
376
376
 
377
377
    return {'lfeat_val': lval,