HarmonicOscillatorWithInteraction now inherits from HarmonicOscillator, instead of directly from Hamiltonian. Also, the Hamiltonian base class now computes the kinetic part of the local energy, while the derived classes compute the remaining part of the energy depending upon the model.