change function in cnf to f scalar... array... =
Merge branch 'master' of github.com:amosr/papers