Bugfix: generateData.py fixed problem where sometimes equations had x and sometimes had x1

generateData.py fixed problem where sometimes equations had x and sometimes had x1 in raw_eqn_to_str, raw_eqn_to_skeleton_structure functions.