Integrating Analogical Mapping and General Problem Solving