From 64533a1beb8bc537a81c563ba241a8c3bada3f4c Mon Sep 17 00:00:00 2001 From: Lazloo Date: Wed, 20 Jul 2016 08:05:15 +0200 Subject: [PATCH] 20160720 Debug GUI: 1. Title for importing inut data changed to "Select Import Data" 2. FIxed Values during 3D interpolation can now be changed manually Debug Interpolation: 1. In case of 3D inpolation: Basis function can now be plotted Signed-off-by: Lazloo --- GUI/KrigingGUI.m | 2 +- GUI/dialogInterpolation.m | 4 +- Tutorial/TestData/inputTest.txt | 216 ++++++++++++++++++ Tutorial/TestData/outputTest.txt | 216 ++++++++++++++++++ .../calcMutualInterpolation_23D.m | 2 +- .../@AnalyzeKriging/evaluateBasisFunction.m | 19 +- 6 files changed, 451 insertions(+), 8 deletions(-) create mode 100644 Tutorial/TestData/inputTest.txt create mode 100644 Tutorial/TestData/outputTest.txt diff --git a/GUI/KrigingGUI.m b/GUI/KrigingGUI.m index 66cc4d3..21d341d 100644 --- a/GUI/KrigingGUI.m +++ b/GUI/KrigingGUI.m @@ -143,7 +143,7 @@ function LoadDataButton_Callback(hObject, eventdata, handles) inputData = []; outputData = []; -[filenameIn,pathIn] = uigetfile('*.txt','Select Import Data'); +[filenameIn,pathIn] = uigetfile('*.txt','Select Input Data'); if filenameIn~=0 inputData = importdata(strcat(pathIn,filenameIn)); diff --git a/GUI/dialogInterpolation.m b/GUI/dialogInterpolation.m index aaf9e62..286b5c6 100644 --- a/GUI/dialogInterpolation.m +++ b/GUI/dialogInterpolation.m @@ -523,13 +523,15 @@ function uitableInputParameters_CellEditCallback(hObject, eventdata, handles) currentRow = get(handles.popupmenuCurrentRow,'Value'); data = get(handles.uitableInputParameters,'Data'); counter = 1; +inputNames = handles.KrigingAnalysisObj.getInputVarNames(handles.currentObj); +idxVar = strcmp(inputNames,data{counter,1}); % for iVar=setdiff(1:nInputVar,handles.InputVarIndiceMatrix(currentRow,1:3)) if handles.InterpolationType<=3 % for iVar=setdiff(1:nInputVar,handles.InputVarIndiceMatrix(currentRow,1:end)) % handles.InputVarValueMatrix(currentRow,iVar) = str2double(data{counter,2}); % counter = counter + 1; % end - handles.InputVarValueMatrix(currentRow,str2double(data{counter,1})) = str2double(data{counter,2}); + handles.InputVarValueMatrix(currentRow,idxVar) = str2double(data{counter,2}); else for iVar=setdiff(1:nInputVar,handles.InputVarIndiceMatrix(currentRow,1:3)) handles.InputVarValueMatrix(currentRow,iVar) = str2double(data{counter,2}); diff --git a/Tutorial/TestData/inputTest.txt b/Tutorial/TestData/inputTest.txt new file mode 100644 index 0000000..0cc660e --- /dev/null +++ b/Tutorial/TestData/inputTest.txt @@ -0,0 +1,216 @@ + 0.0000000e+00 0.0000000e+00 0.0000000e+00 + 2.0000000e+00 0.0000000e+00 0.0000000e+00 + 4.0000000e+00 0.0000000e+00 0.0000000e+00 + 6.0000000e+00 0.0000000e+00 0.0000000e+00 + 8.0000000e+00 0.0000000e+00 0.0000000e+00 + 1.0000000e+01 0.0000000e+00 0.0000000e+00 + 0.0000000e+00 2.0000000e+00 0.0000000e+00 + 2.0000000e+00 2.0000000e+00 0.0000000e+00 + 4.0000000e+00 2.0000000e+00 0.0000000e+00 + 6.0000000e+00 2.0000000e+00 0.0000000e+00 + 8.0000000e+00 2.0000000e+00 0.0000000e+00 + 1.0000000e+01 2.0000000e+00 0.0000000e+00 + 0.0000000e+00 4.0000000e+00 0.0000000e+00 + 2.0000000e+00 4.0000000e+00 0.0000000e+00 + 4.0000000e+00 4.0000000e+00 0.0000000e+00 + 6.0000000e+00 4.0000000e+00 0.0000000e+00 + 8.0000000e+00 4.0000000e+00 0.0000000e+00 + 1.0000000e+01 4.0000000e+00 0.0000000e+00 + 0.0000000e+00 6.0000000e+00 0.0000000e+00 + 2.0000000e+00 6.0000000e+00 0.0000000e+00 + 4.0000000e+00 6.0000000e+00 0.0000000e+00 + 6.0000000e+00 6.0000000e+00 0.0000000e+00 + 8.0000000e+00 6.0000000e+00 0.0000000e+00 + 1.0000000e+01 6.0000000e+00 0.0000000e+00 + 0.0000000e+00 8.0000000e+00 0.0000000e+00 + 2.0000000e+00 8.0000000e+00 0.0000000e+00 + 4.0000000e+00 8.0000000e+00 0.0000000e+00 + 6.0000000e+00 8.0000000e+00 0.0000000e+00 + 8.0000000e+00 8.0000000e+00 0.0000000e+00 + 1.0000000e+01 8.0000000e+00 0.0000000e+00 + 0.0000000e+00 1.0000000e+01 0.0000000e+00 + 2.0000000e+00 1.0000000e+01 0.0000000e+00 + 4.0000000e+00 1.0000000e+01 0.0000000e+00 + 6.0000000e+00 1.0000000e+01 0.0000000e+00 + 8.0000000e+00 1.0000000e+01 0.0000000e+00 + 1.0000000e+01 1.0000000e+01 0.0000000e+00 + 0.0000000e+00 0.0000000e+00 2.0000000e+00 + 2.0000000e+00 0.0000000e+00 2.0000000e+00 + 4.0000000e+00 0.0000000e+00 2.0000000e+00 + 6.0000000e+00 0.0000000e+00 2.0000000e+00 + 8.0000000e+00 0.0000000e+00 2.0000000e+00 + 1.0000000e+01 0.0000000e+00 2.0000000e+00 + 0.0000000e+00 2.0000000e+00 2.0000000e+00 + 2.0000000e+00 2.0000000e+00 2.0000000e+00 + 4.0000000e+00 2.0000000e+00 2.0000000e+00 + 6.0000000e+00 2.0000000e+00 2.0000000e+00 + 8.0000000e+00 2.0000000e+00 2.0000000e+00 + 1.0000000e+01 2.0000000e+00 2.0000000e+00 + 0.0000000e+00 4.0000000e+00 2.0000000e+00 + 2.0000000e+00 4.0000000e+00 2.0000000e+00 + 4.0000000e+00 4.0000000e+00 2.0000000e+00 + 6.0000000e+00 4.0000000e+00 2.0000000e+00 + 8.0000000e+00 4.0000000e+00 2.0000000e+00 + 1.0000000e+01 4.0000000e+00 2.0000000e+00 + 0.0000000e+00 6.0000000e+00 2.0000000e+00 + 2.0000000e+00 6.0000000e+00 2.0000000e+00 + 4.0000000e+00 6.0000000e+00 2.0000000e+00 + 6.0000000e+00 6.0000000e+00 2.0000000e+00 + 8.0000000e+00 6.0000000e+00 2.0000000e+00 + 1.0000000e+01 6.0000000e+00 2.0000000e+00 + 0.0000000e+00 8.0000000e+00 2.0000000e+00 + 2.0000000e+00 8.0000000e+00 2.0000000e+00 + 4.0000000e+00 8.0000000e+00 2.0000000e+00 + 6.0000000e+00 8.0000000e+00 2.0000000e+00 + 8.0000000e+00 8.0000000e+00 2.0000000e+00 + 1.0000000e+01 8.0000000e+00 2.0000000e+00 + 0.0000000e+00 1.0000000e+01 2.0000000e+00 + 2.0000000e+00 1.0000000e+01 2.0000000e+00 + 4.0000000e+00 1.0000000e+01 2.0000000e+00 + 6.0000000e+00 1.0000000e+01 2.0000000e+00 + 8.0000000e+00 1.0000000e+01 2.0000000e+00 + 1.0000000e+01 1.0000000e+01 2.0000000e+00 + 0.0000000e+00 0.0000000e+00 4.0000000e+00 + 2.0000000e+00 0.0000000e+00 4.0000000e+00 + 4.0000000e+00 0.0000000e+00 4.0000000e+00 + 6.0000000e+00 0.0000000e+00 4.0000000e+00 + 8.0000000e+00 0.0000000e+00 4.0000000e+00 + 1.0000000e+01 0.0000000e+00 4.0000000e+00 + 0.0000000e+00 2.0000000e+00 4.0000000e+00 + 2.0000000e+00 2.0000000e+00 4.0000000e+00 + 4.0000000e+00 2.0000000e+00 4.0000000e+00 + 6.0000000e+00 2.0000000e+00 4.0000000e+00 + 8.0000000e+00 2.0000000e+00 4.0000000e+00 + 1.0000000e+01 2.0000000e+00 4.0000000e+00 + 0.0000000e+00 4.0000000e+00 4.0000000e+00 + 2.0000000e+00 4.0000000e+00 4.0000000e+00 + 4.0000000e+00 4.0000000e+00 4.0000000e+00 + 6.0000000e+00 4.0000000e+00 4.0000000e+00 + 8.0000000e+00 4.0000000e+00 4.0000000e+00 + 1.0000000e+01 4.0000000e+00 4.0000000e+00 + 0.0000000e+00 6.0000000e+00 4.0000000e+00 + 2.0000000e+00 6.0000000e+00 4.0000000e+00 + 4.0000000e+00 6.0000000e+00 4.0000000e+00 + 6.0000000e+00 6.0000000e+00 4.0000000e+00 + 8.0000000e+00 6.0000000e+00 4.0000000e+00 + 1.0000000e+01 6.0000000e+00 4.0000000e+00 + 0.0000000e+00 8.0000000e+00 4.0000000e+00 + 2.0000000e+00 8.0000000e+00 4.0000000e+00 + 4.0000000e+00 8.0000000e+00 4.0000000e+00 + 6.0000000e+00 8.0000000e+00 4.0000000e+00 + 8.0000000e+00 8.0000000e+00 4.0000000e+00 + 1.0000000e+01 8.0000000e+00 4.0000000e+00 + 0.0000000e+00 1.0000000e+01 4.0000000e+00 + 2.0000000e+00 1.0000000e+01 4.0000000e+00 + 4.0000000e+00 1.0000000e+01 4.0000000e+00 + 6.0000000e+00 1.0000000e+01 4.0000000e+00 + 8.0000000e+00 1.0000000e+01 4.0000000e+00 + 1.0000000e+01 1.0000000e+01 4.0000000e+00 + 0.0000000e+00 0.0000000e+00 6.0000000e+00 + 2.0000000e+00 0.0000000e+00 6.0000000e+00 + 4.0000000e+00 0.0000000e+00 6.0000000e+00 + 6.0000000e+00 0.0000000e+00 6.0000000e+00 + 8.0000000e+00 0.0000000e+00 6.0000000e+00 + 1.0000000e+01 0.0000000e+00 6.0000000e+00 + 0.0000000e+00 2.0000000e+00 6.0000000e+00 + 2.0000000e+00 2.0000000e+00 6.0000000e+00 + 4.0000000e+00 2.0000000e+00 6.0000000e+00 + 6.0000000e+00 2.0000000e+00 6.0000000e+00 + 8.0000000e+00 2.0000000e+00 6.0000000e+00 + 1.0000000e+01 2.0000000e+00 6.0000000e+00 + 0.0000000e+00 4.0000000e+00 6.0000000e+00 + 2.0000000e+00 4.0000000e+00 6.0000000e+00 + 4.0000000e+00 4.0000000e+00 6.0000000e+00 + 6.0000000e+00 4.0000000e+00 6.0000000e+00 + 8.0000000e+00 4.0000000e+00 6.0000000e+00 + 1.0000000e+01 4.0000000e+00 6.0000000e+00 + 0.0000000e+00 6.0000000e+00 6.0000000e+00 + 2.0000000e+00 6.0000000e+00 6.0000000e+00 + 4.0000000e+00 6.0000000e+00 6.0000000e+00 + 6.0000000e+00 6.0000000e+00 6.0000000e+00 + 8.0000000e+00 6.0000000e+00 6.0000000e+00 + 1.0000000e+01 6.0000000e+00 6.0000000e+00 + 0.0000000e+00 8.0000000e+00 6.0000000e+00 + 2.0000000e+00 8.0000000e+00 6.0000000e+00 + 4.0000000e+00 8.0000000e+00 6.0000000e+00 + 6.0000000e+00 8.0000000e+00 6.0000000e+00 + 8.0000000e+00 8.0000000e+00 6.0000000e+00 + 1.0000000e+01 8.0000000e+00 6.0000000e+00 + 0.0000000e+00 1.0000000e+01 6.0000000e+00 + 2.0000000e+00 1.0000000e+01 6.0000000e+00 + 4.0000000e+00 1.0000000e+01 6.0000000e+00 + 6.0000000e+00 1.0000000e+01 6.0000000e+00 + 8.0000000e+00 1.0000000e+01 6.0000000e+00 + 1.0000000e+01 1.0000000e+01 6.0000000e+00 + 0.0000000e+00 0.0000000e+00 8.0000000e+00 + 2.0000000e+00 0.0000000e+00 8.0000000e+00 + 4.0000000e+00 0.0000000e+00 8.0000000e+00 + 6.0000000e+00 0.0000000e+00 8.0000000e+00 + 8.0000000e+00 0.0000000e+00 8.0000000e+00 + 1.0000000e+01 0.0000000e+00 8.0000000e+00 + 0.0000000e+00 2.0000000e+00 8.0000000e+00 + 2.0000000e+00 2.0000000e+00 8.0000000e+00 + 4.0000000e+00 2.0000000e+00 8.0000000e+00 + 6.0000000e+00 2.0000000e+00 8.0000000e+00 + 8.0000000e+00 2.0000000e+00 8.0000000e+00 + 1.0000000e+01 2.0000000e+00 8.0000000e+00 + 0.0000000e+00 4.0000000e+00 8.0000000e+00 + 2.0000000e+00 4.0000000e+00 8.0000000e+00 + 4.0000000e+00 4.0000000e+00 8.0000000e+00 + 6.0000000e+00 4.0000000e+00 8.0000000e+00 + 8.0000000e+00 4.0000000e+00 8.0000000e+00 + 1.0000000e+01 4.0000000e+00 8.0000000e+00 + 0.0000000e+00 6.0000000e+00 8.0000000e+00 + 2.0000000e+00 6.0000000e+00 8.0000000e+00 + 4.0000000e+00 6.0000000e+00 8.0000000e+00 + 6.0000000e+00 6.0000000e+00 8.0000000e+00 + 8.0000000e+00 6.0000000e+00 8.0000000e+00 + 1.0000000e+01 6.0000000e+00 8.0000000e+00 + 0.0000000e+00 8.0000000e+00 8.0000000e+00 + 2.0000000e+00 8.0000000e+00 8.0000000e+00 + 4.0000000e+00 8.0000000e+00 8.0000000e+00 + 6.0000000e+00 8.0000000e+00 8.0000000e+00 + 8.0000000e+00 8.0000000e+00 8.0000000e+00 + 1.0000000e+01 8.0000000e+00 8.0000000e+00 + 0.0000000e+00 1.0000000e+01 8.0000000e+00 + 2.0000000e+00 1.0000000e+01 8.0000000e+00 + 4.0000000e+00 1.0000000e+01 8.0000000e+00 + 6.0000000e+00 1.0000000e+01 8.0000000e+00 + 8.0000000e+00 1.0000000e+01 8.0000000e+00 + 1.0000000e+01 1.0000000e+01 8.0000000e+00 + 0.0000000e+00 0.0000000e+00 1.0000000e+01 + 2.0000000e+00 0.0000000e+00 1.0000000e+01 + 4.0000000e+00 0.0000000e+00 1.0000000e+01 + 6.0000000e+00 0.0000000e+00 1.0000000e+01 + 8.0000000e+00 0.0000000e+00 1.0000000e+01 + 1.0000000e+01 0.0000000e+00 1.0000000e+01 + 0.0000000e+00 2.0000000e+00 1.0000000e+01 + 2.0000000e+00 2.0000000e+00 1.0000000e+01 + 4.0000000e+00 2.0000000e+00 1.0000000e+01 + 6.0000000e+00 2.0000000e+00 1.0000000e+01 + 8.0000000e+00 2.0000000e+00 1.0000000e+01 + 1.0000000e+01 2.0000000e+00 1.0000000e+01 + 0.0000000e+00 4.0000000e+00 1.0000000e+01 + 2.0000000e+00 4.0000000e+00 1.0000000e+01 + 4.0000000e+00 4.0000000e+00 1.0000000e+01 + 6.0000000e+00 4.0000000e+00 1.0000000e+01 + 8.0000000e+00 4.0000000e+00 1.0000000e+01 + 1.0000000e+01 4.0000000e+00 1.0000000e+01 + 0.0000000e+00 6.0000000e+00 1.0000000e+01 + 2.0000000e+00 6.0000000e+00 1.0000000e+01 + 4.0000000e+00 6.0000000e+00 1.0000000e+01 + 6.0000000e+00 6.0000000e+00 1.0000000e+01 + 8.0000000e+00 6.0000000e+00 1.0000000e+01 + 1.0000000e+01 6.0000000e+00 1.0000000e+01 + 0.0000000e+00 8.0000000e+00 1.0000000e+01 + 2.0000000e+00 8.0000000e+00 1.0000000e+01 + 4.0000000e+00 8.0000000e+00 1.0000000e+01 + 6.0000000e+00 8.0000000e+00 1.0000000e+01 + 8.0000000e+00 8.0000000e+00 1.0000000e+01 + 1.0000000e+01 8.0000000e+00 1.0000000e+01 + 0.0000000e+00 1.0000000e+01 1.0000000e+01 + 2.0000000e+00 1.0000000e+01 1.0000000e+01 + 4.0000000e+00 1.0000000e+01 1.0000000e+01 + 6.0000000e+00 1.0000000e+01 1.0000000e+01 + 8.0000000e+00 1.0000000e+01 1.0000000e+01 + 1.0000000e+01 1.0000000e+01 1.0000000e+01 diff --git a/Tutorial/TestData/outputTest.txt b/Tutorial/TestData/outputTest.txt new file mode 100644 index 0000000..c720511 --- /dev/null +++ b/Tutorial/TestData/outputTest.txt @@ -0,0 +1,216 @@ + 0.0000000e+00 + 0.0000000e+00 + 0.0000000e+00 + 0.0000000e+00 + 0.0000000e+00 + 0.0000000e+00 + 0.0000000e+00 + 2.5979926e+00 + 4.0413219e+00 + 4.9598041e+00 + 5.5956765e+00 + 6.0619828e+00 + 0.0000000e+00 + -2.1622928e+00 + -3.3635666e+00 + -4.1280136e+00 + -4.6572461e+00 + -5.0453500e+00 + 0.0000000e+00 + -7.9832999e-01 + -1.2418467e+00 + -1.5240845e+00 + -1.7194800e+00 + -1.8627700e+00 + 0.0000000e+00 + 2.8267378e+00 + 4.3971478e+00 + 5.3964995e+00 + 6.0883584e+00 + 6.5957216e+00 + 0.0000000e+00 + -1.5543460e+00 + -2.4178716e+00 + -2.9673879e+00 + -3.3478222e+00 + -3.6268074e+00 + 2.0000000e+00 + 2.0000000e+00 + 2.0000000e+00 + 2.0000000e+00 + 2.0000000e+00 + 2.0000000e+00 + 2.0000000e+00 + 4.5979926e+00 + 6.0413219e+00 + 6.9598041e+00 + 7.5956765e+00 + 8.0619828e+00 + 2.0000000e+00 + -1.6229284e-01 + -1.3635666e+00 + -2.1280136e+00 + -2.6572461e+00 + -3.0453500e+00 + 2.0000000e+00 + 1.2016700e+00 + 7.5815334e-01 + 4.7591546e-01 + 2.8052001e-01 + 1.3723001e-01 + 2.0000000e+00 + 4.8267378e+00 + 6.3971478e+00 + 7.3964995e+00 + 8.0883584e+00 + 8.5957216e+00 + 2.0000000e+00 + 4.4565397e-01 + -4.1787160e-01 + -9.6738788e-01 + -1.3478222e+00 + -1.6268074e+00 + 4.0000000e+00 + 4.0000000e+00 + 4.0000000e+00 + 4.0000000e+00 + 4.0000000e+00 + 4.0000000e+00 + 4.0000000e+00 + 6.5979926e+00 + 8.0413219e+00 + 8.9598041e+00 + 9.5956765e+00 + 1.0061983e+01 + 4.0000000e+00 + 1.8377072e+00 + 6.3643335e-01 + -1.2801361e-01 + -6.5724612e-01 + -1.0453500e+00 + 4.0000000e+00 + 3.2016700e+00 + 2.7581533e+00 + 2.4759155e+00 + 2.2805200e+00 + 2.1372300e+00 + 4.0000000e+00 + 6.8267378e+00 + 8.3971478e+00 + 9.3964995e+00 + 1.0088358e+01 + 1.0595722e+01 + 4.0000000e+00 + 2.4456540e+00 + 1.5821284e+00 + 1.0326121e+00 + 6.5217778e-01 + 3.7319259e-01 + 6.0000000e+00 + 6.0000000e+00 + 6.0000000e+00 + 6.0000000e+00 + 6.0000000e+00 + 6.0000000e+00 + 6.0000000e+00 + 8.5979926e+00 + 1.0041322e+01 + 1.0959804e+01 + 1.1595676e+01 + 1.2061983e+01 + 6.0000000e+00 + 3.8377072e+00 + 2.6364334e+00 + 1.8719864e+00 + 1.3427539e+00 + 9.5465003e-01 + 6.0000000e+00 + 5.2016700e+00 + 4.7581533e+00 + 4.4759155e+00 + 4.2805200e+00 + 4.1372300e+00 + 6.0000000e+00 + 8.8267378e+00 + 1.0397148e+01 + 1.1396500e+01 + 1.2088358e+01 + 1.2595722e+01 + 6.0000000e+00 + 4.4456540e+00 + 3.5821284e+00 + 3.0326121e+00 + 2.6521778e+00 + 2.3731926e+00 + 8.0000000e+00 + 8.0000000e+00 + 8.0000000e+00 + 8.0000000e+00 + 8.0000000e+00 + 8.0000000e+00 + 8.0000000e+00 + 1.0597993e+01 + 1.2041322e+01 + 1.2959804e+01 + 1.3595676e+01 + 1.4061983e+01 + 8.0000000e+00 + 5.8377072e+00 + 4.6364334e+00 + 3.8719864e+00 + 3.3427539e+00 + 2.9546500e+00 + 8.0000000e+00 + 7.2016700e+00 + 6.7581533e+00 + 6.4759155e+00 + 6.2805200e+00 + 6.1372300e+00 + 8.0000000e+00 + 1.0826738e+01 + 1.2397148e+01 + 1.3396500e+01 + 1.4088358e+01 + 1.4595722e+01 + 8.0000000e+00 + 6.4456540e+00 + 5.5821284e+00 + 5.0326121e+00 + 4.6521778e+00 + 4.3731926e+00 + 1.0000000e+01 + 1.0000000e+01 + 1.0000000e+01 + 1.0000000e+01 + 1.0000000e+01 + 1.0000000e+01 + 1.0000000e+01 + 1.2597993e+01 + 1.4041322e+01 + 1.4959804e+01 + 1.5595676e+01 + 1.6061983e+01 + 1.0000000e+01 + 7.8377072e+00 + 6.6364334e+00 + 5.8719864e+00 + 5.3427539e+00 + 4.9546500e+00 + 1.0000000e+01 + 9.2016700e+00 + 8.7581533e+00 + 8.4759155e+00 + 8.2805200e+00 + 8.1372300e+00 + 1.0000000e+01 + 1.2826738e+01 + 1.4397148e+01 + 1.5396500e+01 + 1.6088358e+01 + 1.6595722e+01 + 1.0000000e+01 + 8.4456540e+00 + 7.5821284e+00 + 7.0326121e+00 + 6.6521778e+00 + 6.3731926e+00 diff --git a/dependencies/@AnalyzeKriging/calcMutualInterpolation_23D.m b/dependencies/@AnalyzeKriging/calcMutualInterpolation_23D.m index 6be1132..c20df0b 100644 --- a/dependencies/@AnalyzeKriging/calcMutualInterpolation_23D.m +++ b/dependencies/@AnalyzeKriging/calcMutualInterpolation_23D.m @@ -192,7 +192,7 @@ function [] = doInterpolation() if obj.ShowBasisFct==1 % Calculated only evaluation of the basis function - evaluateBasisFunction(obj,KrigingObjectIndex,Input); + evaluateBasisFunction(obj,KrigingObjectIndex,Input,dimensionInterpolation); else % Actual Kriging Estimation if nKrigingObjectIndex==1 diff --git a/dependencies/@AnalyzeKriging/evaluateBasisFunction.m b/dependencies/@AnalyzeKriging/evaluateBasisFunction.m index 2fff443..7fad934 100644 --- a/dependencies/@AnalyzeKriging/evaluateBasisFunction.m +++ b/dependencies/@AnalyzeKriging/evaluateBasisFunction.m @@ -3,11 +3,12 @@ % See the license note at the end of the file. KrigingObjectIndex = varargin{1}; Input = varargin{2}; - + dimensionInterpolation = varargin{3}; + % Calculate linear parameters automatically applied by Kriging BasisFct = obj.KrigingObjects{KrigingObjectIndex}.getBasisFct; obj.KrigingObjects{KrigingObjectIndex}.estimateBasisFctCoefficients; - obj.KrigingPrediction_Interpolation3D{KrigingObjectIndex,1} = zeros(size(Input,1),2); + OutputMatrix = zeros(size(Input,1),2); basisCoeff = obj.KrigingObjects{KrigingObjectIndex}.getBasisFctCoefficients; if obj.KrigingObjects{KrigingObjectIndex}.getUseSimpleKriging basisCoeff(:)=1; @@ -15,13 +16,21 @@ % Actual evaluation for iBasisFctNested = 1 : size(BasisFct,1) - obj.KrigingPrediction_Interpolation3D{KrigingObjectIndex,1} = ... - obj.KrigingPrediction_Interpolation3D{KrigingObjectIndex,1}+ ... + OutputMatrix = ... + OutputMatrix+ ... basisCoeff(iBasisFctNested)*... [BasisFct{iBasisFctNested}(obj.KrigingObjects{KrigingObjectIndex}.getBasisFctParameters,Input),... zeros(size(Input,1),1)]; end - + + switch dimensionInterpolation + case 2 + obj.KrigingPrediction_Interpolation2D{KrigingObjectIndex,1} = OutputMatrix; + case 3 + obj.KrigingPrediction_Interpolation3D{KrigingObjectIndex,1} = OutputMatrix; + otherwise + error('Diminsion is unusual') + end end % =============================================================================