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

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

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

@@ -1,7 +1,11 @@
 import pandas as pd
+<<<<<<< HEAD
 import numpy as np
 from  scipy.stats import zscore
 from sklearn.decomposition import PCA
+=======
+from  scipy.stats import zscore
+>>>>>>> remotes/origin/盘荣博
 import matplotlib.pyplot as plt
 from matplotlib.pyplot import ylabel
 df = pd.read_excel("棉花产量论文作业的数据.xlsx")
@@ -40,6 +44,7 @@ plt.scatter(data2[:,:1],data2[:,1:2],c='g')
 plt.xlabel('压缩到0~1')
 print(data==data1)
 
+<<<<<<< HEAD
 # plt.savefig("shuju.jpg",dpi=2000)
 # plt.show()
 md= PCA().fit(data)
@@ -58,4 +63,8 @@ print(md.explained_variance_ratio_)
 print('特征向量：')
 print(d.T)
 print(md.components_)
-print(md.components_-d.T<=0.1)
+print(md.components_-d.T<=0.1)
+=======
+plt.savefig("shuju.jpg",dpi=2000)
+plt.show()
+>>>>>>> remotes/origin/盘荣博