changed weights to new format
added shmac abr.
Merge branch 'master' of github.com:terjr/thesis