9b1af381e74ae4e967c0a3878353b3256f0aadab,pykrige/uk3d.py,UniversalKriging3D,__init__,#UniversalKriging3D#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#Any#,230

Before Change

        if self.verbose:
            print("Adjusting data for anisotropy...")
        self.X_ADJUSTED, self.Y_ADJUSTED, self.Z_ADJUSTED = \
            core.adjust_for_anisotropy_3d(np.copy(self.X_ORIG), np.copy(self.Y_ORIG), np.copy(self.Z_ORIG),
                                          self.XCENTER, self.YCENTER, self.ZCENTER, self.anisotropy_scaling_y,
                                          self.anisotropy_scaling_z, self.anisotropy_angle_x, self.anisotropy_angle_y,
                                          self.anisotropy_angle_z)

        self.variogram_model = variogram_model
        if self.variogram_model not in self.variogram_dict.keys() and self.variogram_model != "custom":
            raise ValueError("Specified variogram model "%s" is not supported." % variogram_model)

After Change

        // Code assumes 1D input arrays. Ensures that any extraneous dimensions
        // don"t get in the way. Copies are created to avoid any problems with
        // referencing the original passed arguments.
        self.X_ORIG = np.atleast_1d(np.squeeze(np.array(x, copy=True)))
        self.Y_ORIG = np.atleast_1d(np.squeeze(np.array(y, copy=True)))
        self.Z_ORIG = np.atleast_1d(np.squeeze(np.array(z, copy=True)))
        self.VALUES = np.atleast_1d(np.squeeze(np.array(val, copy=True)))

        self.verbose = verbose
        self.enable_plotting = enable_plotting
        if self.enable_plotting and self.verbose:
            print("Plotting Enabled\n")

        self.XCENTER = (np.amax(self.X_ORIG) + np.amin(self.X_ORIG))/2.0
        self.YCENTER = (np.amax(self.Y_ORIG) + np.amin(self.Y_ORIG))/2.0
        self.ZCENTER = (np.amax(self.Z_ORIG) + np.amin(self.Z_ORIG))/2.0
        self.anisotropy_scaling_y = anisotropy_scaling_y
        self.anisotropy_scaling_z = anisotropy_scaling_z
        self.anisotropy_angle_x = anisotropy_angle_x
        self.anisotropy_angle_y = anisotropy_angle_y
        self.anisotropy_angle_z = anisotropy_angle_z
        if self.verbose:
            print("Adjusting data for anisotropy...")
        self.X_ADJUSTED, self.Y_ADJUSTED, self.Z_ADJUSTED = \
             _adjust_for_anisotropy(np.vstack((self.X_ORIG, self.Y_ORIG, self.Z_ORIG)).T,
                                    [self.XCENTER, self.YCENTER, self.ZCENTER],
                                    [self.anisotropy_scaling_y, self.anisotropy_scaling_z],
                                    [self.anisotropy_angle_x, self.anisotropy_angle_y,
                                    self.anisotropy_angle_z]).T

        self.variogram_model = variogram_model
        if self.variogram_model not in self.variogram_dict.keys() and self.variogram_model != "custom":
            raise ValueError("Specified variogram model "%s" is not supported." % variogram_model)

Instances