640d91404771e314b7c85fcf1b733182567902df,trunk/SUAVE/Components/Energy/Networks/Propulsor_Surrogate.py,Propulsor_Surrogate,build_surrogate,#Propulsor_Surrogate#,122

Before Change

        // Pick the type of process
        if self.surrogate_type  == "gaussian":
            regr_sfc = gaussian_process.GaussianProcess(theta0=50.,thetaL=8.,thetaU=100.)
            regr_thr = gaussian_process.GaussianProcess(theta0=15.,thetaL=8.,thetaU=100.)                
            thr_surrogate = regr_thr.fit(xy, thr)
            sfc_surrogate = regr_sfc.fit(xy, sfc)  
            
        elif self.surrogate_type  == "knn":
            regr_sfc = neighbors.KNeighborsRegressor(n_neighbors=1,weights="distance")
            regr_thr = neighbors.KNeighborsRegressor(n_neighbors=1,weights="distance")
            sfc_surrogate = regr_sfc.fit(xy, sfc)
            thr_surrogate = regr_thr.fit(xy, thr)  
    
        elif self.surrogate_type  == "svr":
            regr_thr = svm.SVR(C=500.)
            regr_sfc = svm.SVR(C=500.)
            sfc_surrogate  = regr_sfc.fit(xy, sfc)
            thr_surrogate  = regr_thr.fit(xy, thr)           
        
        
        // Save the output
        self.sfc_surrogate    = sfc_surrogate
        self.thrust_surrogate = thr_surrogate     

After Change

        // Pick the type of process
        if self.surrogate_type  == "gaussian":
            regr_sfc = gaussian_process.GaussianProcessRegressor()
            regr_thr = gaussian_process.GaussianProcessRegressor()                
            thr_surrogate = regr_thr.fit(xy, thr)
            sfc_surrogate = regr_sfc.fit(xy, sfc)  
            
        elif self.surrogate_type  == "knn":
            regr_sfc = neighbors.KNeighborsRegressor(n_neighbors=1,weights="distance")
            regr_thr = neighbors.KNeighborsRegressor(n_neighbors=1,weights="distance")
            sfc_surrogate = regr_sfc.fit(xy, sfc)
            thr_surrogate = regr_thr.fit(xy, thr)  
    
        elif self.surrogate_type  == "svr":
            regr_thr = svm.SVR(C=500.)
            regr_sfc = svm.SVR(C=500.)
            sfc_surrogate  = regr_sfc.fit(xy, sfc)
            thr_surrogate  = regr_thr.fit(xy, thr)           
        
        
        // Save the output
        self.sfc_surrogate    = sfc_surrogate
        self.thrust_surrogate = thr_surrogate     

Instances