3 Commits 76c2a2c958 ... c0a0eb75fa

Author SHA1 Message Date
  zhuxi c0a0eb75fa Merge branch 'dev' of http://git.fast-fun.cn:92/lmstack/data_analyze_platform into dev 2 years ago
  zhuxi 3464dba951 Merge branch 'dev' of http://git.fast-fun.cn:92/lmstack/data_analyze_platform into dev 2 years ago
  zhuxi ea94bf1f36 core 2 years ago
1 changed files with 1 additions and 1 deletions
  1. 1 1
      LIB/MIDDLE/InfoChrgDrive/Charge/V1_0_0/coreV0.py

+ 1 - 1
LIB/MIDDLE/InfoChrgDrive/Charge/V1_0_0/coreV0.py

@@ -458,7 +458,7 @@ def prediction(datatest,kmeans1,kmeans2,kmeans3):
             Xt11['cluster_db']=y_hat
             Xt11['cluster_db']=y_hat
             Xt121=Xt11[(Xt11['cluster_db']==0)|(Xt11['cluster_db']==1)]
             Xt121=Xt11[(Xt11['cluster_db']==0)|(Xt11['cluster_db']==1)]
             Xt121['charge_env']='室外'
             Xt121['charge_env']='室外'
-            datatest=pd.merge(Xt121['charge_env'],datatest,how='outer',right_index=True,left_index=True)
+            datatest=pd.merge(datatest,Xt121['charge_env'],how='outer',right_index=True,left_index=True)
             #KMeans2
             #KMeans2
             Xt12=Xt11[(Xt11['cluster_db']==2)|(Xt11['cluster_db']==3)]
             Xt12=Xt11[(Xt11['cluster_db']==2)|(Xt11['cluster_db']==3)]
             if len(Xt12)>0:
             if len(Xt12)>0: