Skip to content
This repository has been archived by the owner on Jan 12, 2025. It is now read-only.

Commit

Permalink
20160720
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
Lazloo committed Jul 20, 2016
1 parent 8163606 commit 64533a1
Show file tree
Hide file tree
Showing 6 changed files with 451 additions and 8 deletions.
2 changes: 1 addition & 1 deletion GUI/KrigingGUI.m
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
4 changes: 3 additions & 1 deletion GUI/dialogInterpolation.m
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down
216 changes: 216 additions & 0 deletions Tutorial/TestData/inputTest.txt
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 64533a1

Please sign in to comment.