From 3b7a6f59e4a0d267a82d1cdc9f451665a9f9b7b4 Mon Sep 17 00:00:00 2001 From: scalinon <sylvain.calinon@idiap.ch> Date: Mon, 6 Jan 2020 18:50:59 +0100 Subject: [PATCH] relative paths fixed --- demos/benchmarks/benchmark_DS_GP_GMM01.m | 4 ++-- demos/benchmarks/benchmark_DS_GP_raw01.m | 4 ++-- demos/benchmarks/benchmark_DS_PGMM01.m | 4 ++-- demos/benchmarks/benchmark_DS_TP_GMM01.m | 4 ++-- demos/benchmarks/benchmark_DS_TP_GP01.m | 4 ++-- demos/benchmarks/benchmark_DS_TP_LWR01.m | 4 ++-- demos/benchmarks/benchmark_DS_TP_MFA01.m | 4 ++-- demos/benchmarks/benchmark_DS_TP_trajGMM01.m | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/demos/benchmarks/benchmark_DS_GP_GMM01.m b/demos/benchmarks/benchmark_DS_GP_GMM01.m index 27a27bc..ab405f6 100644 --- a/demos/benchmarks/benchmark_DS_GP_GMM01.m +++ b/demos/benchmarks/benchmark_DS_GP_GMM01.m @@ -57,7 +57,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -150,7 +150,7 @@ end %% Reproduction with GPR and DS-GMR for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with DS-GMR...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros rnew(n).p = taskParams(n).p; %Query point vector (position and orientation of the two objects) diff --git a/demos/benchmarks/benchmark_DS_GP_raw01.m b/demos/benchmarks/benchmark_DS_GP_raw01.m index 8fb5f98..bbde36a 100644 --- a/demos/benchmarks/benchmark_DS_GP_raw01.m +++ b/demos/benchmarks/benchmark_DS_GP_raw01.m @@ -55,7 +55,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -113,7 +113,7 @@ end %% Reproduction with GPR for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with spring-damper system...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros rnew(n).p = taskParams(n).p; %Query point vector (position and orientation of the two objects) diff --git a/demos/benchmarks/benchmark_DS_PGMM01.m b/demos/benchmarks/benchmark_DS_PGMM01.m index 3574823..f1c4aeb 100644 --- a/demos/benchmarks/benchmark_DS_PGMM01.m +++ b/demos/benchmarks/benchmark_DS_PGMM01.m @@ -57,7 +57,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -139,7 +139,7 @@ end %% Reproduction with PGMM and DS-GMR for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with DS-GMR...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros rnew(n).p = taskParams(n).p; diff --git a/demos/benchmarks/benchmark_DS_TP_GMM01.m b/demos/benchmarks/benchmark_DS_TP_GMM01.m index 5ec8d2c..34d8607 100644 --- a/demos/benchmarks/benchmark_DS_TP_GMM01.m +++ b/demos/benchmarks/benchmark_DS_TP_GMM01.m @@ -55,7 +55,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -101,7 +101,7 @@ end %% Reproduction for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with DS-GMR...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros %Retrieval of attractor path through task-parameterized GMR anew(n) = estimateAttractorPath(DataIn, model, taskParams(n)); diff --git a/demos/benchmarks/benchmark_DS_TP_GP01.m b/demos/benchmarks/benchmark_DS_TP_GP01.m index 43ffa15..9208935 100644 --- a/demos/benchmarks/benchmark_DS_TP_GP01.m +++ b/demos/benchmarks/benchmark_DS_TP_GP01.m @@ -55,7 +55,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -115,7 +115,7 @@ end %% Reproduction with TP-GP for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with TP-GP and spring-damper system...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros for m=1:model.nbFrames rnew(n).p(m).b = taskParams(n).p(m).b(2:end); diff --git a/demos/benchmarks/benchmark_DS_TP_LWR01.m b/demos/benchmarks/benchmark_DS_TP_LWR01.m index 87686a5..fdc7d43 100644 --- a/demos/benchmarks/benchmark_DS_TP_LWR01.m +++ b/demos/benchmarks/benchmark_DS_TP_LWR01.m @@ -55,7 +55,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -126,7 +126,7 @@ end %% Reproduction with TP-GP for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with TP-GP and spring-damper system...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros for m=1:model.nbFrames rnew(n).p(m).b = taskParams(n).p(m).b(2:end); diff --git a/demos/benchmarks/benchmark_DS_TP_MFA01.m b/demos/benchmarks/benchmark_DS_TP_MFA01.m index 5098c5f..63e58e9 100644 --- a/demos/benchmarks/benchmark_DS_TP_MFA01.m +++ b/demos/benchmarks/benchmark_DS_TP_MFA01.m @@ -57,7 +57,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=200x4 the number of datapoints in a trajectory (200) % multiplied by the number of demonstrations (5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of 'Data' to learn the path of the spring-damper system @@ -103,7 +103,7 @@ end %% Reproduction for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions with DS-GMR...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros %Retrieval of attractor path through task-parameterized GMR anew(n) = estimateAttractorPath(DataIn, model, taskParams(n)); diff --git a/demos/benchmarks/benchmark_DS_TP_trajGMM01.m b/demos/benchmarks/benchmark_DS_TP_trajGMM01.m index 45a724f..d37620c 100644 --- a/demos/benchmarks/benchmark_DS_TP_trajGMM01.m +++ b/demos/benchmarks/benchmark_DS_TP_trajGMM01.m @@ -57,7 +57,7 @@ disp('Load 3rd order tensor data...'); % in the different frames. It is a 3rd order tensor of dimension D x P x N, with D=3 the dimension of a % datapoint, P=2 the number of candidate frames, and N=TM the number of datapoints in a trajectory (T=200) % multiplied by the number of demonstrations (M=5). -load('data/DataLQR01.mat'); +load('./../data/DataLQR01.mat'); %% Transformation of Data to learn the path of the spring-damper system instead of the raw data @@ -171,7 +171,7 @@ end %% Reproduction for new task parameters %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% disp('New reproductions...'); -load('data/taskParams.mat'); %Load new task parameters (new situation) +load('./../data/taskParams.mat'); %Load new task parameters (new situation) for n=1:nbRepros %Adapt task parameters to trajectory GMM for m=1:model.nbFrames -- GitLab