Weapon DPS (Question #2)Follow

Does the dps listed on a weapon factor in any additional damage bonuses from the weapon such as dots, procs, or +damage to fire, cold, nature, shadow, etc.?

Has anyone parsed the "proc" rate on procing weapons?

If I have a weapon that does 25dps and does not have a proc, would a weapon that has 23dps and a 150point proc be better?

(Proc=Chance on hit effects)

Guess that was more than one question. :)

Thanks!