Merge remote-tracking branch 'origin/盘荣博' into 盘荣博

# Conflicts:
#	盘荣博/数据可视化/week1.py

盘荣博/图/例10.py

@@ -25,4 +25,4 @@ nx.draw_networkx_edge_labels(G,pos,edge_labels=w)#绘制标签
 path_edges=list(zip(p,p[1:]))
 print(type(path_edges),"\npath_edges=",path_edges)
 nx.draw_networkx_edges(G,pos,edgelist=path_edges,edge_color="r",width=1)
-plt.savefig("figure10_9.png");plt.show()
+plt.savefig("figure10_9.png",dpi=1000);plt.show()

盘荣博/数据可视化/week1.py

@@ -1,9 +0,0 @@
-import pandas as pd
-import matplotlib.pyplot as plt
-df = pd.read_excel("棉花产量论文作业的数据.xlsx")
-plt.plot(df["年份"],df["单产"])
-plt.rcParams['font.sans-serif']="SimHei"
-plt.ylabel('单产')
-plt.xlabel('年份')
-plt.show()
-print(df)