change matrix data model and implement addition using expression templates