We construct a general multi-factor model for estimation and calibration of commodity spot prices and futures valuation. This extends the multi-factor long-short model in Schwartz and Smith (2000) and Yan (2002) in two important aspects: firstly we allow for both the long and short term dynamic...