The conformation of linear and star polymers in solution