Skip to content
Snippets Groups Projects
Commit d0cec648 authored by Cristian Galperti's avatar Cristian Galperti
Browse files

cosmetics on the main test script

parent 5dfc65c6
Branches
No related tags found
No related merge requests found
...@@ -151,7 +151,6 @@ title('black cross: Simulink simulation, red circles MARTe2 run') ...@@ -151,7 +151,6 @@ title('black cross: Simulink simulation, red circles MARTe2 run')
%% Plot timings %% Plot timings
figure(2) figure(2)
plot(demo1threadcycletime,'k'); plot(demo1threadcycletime,'k');
hold on hold on
plot(demo2threadcycletime,'r'); plot(demo2threadcycletime,'r');
...@@ -176,21 +175,23 @@ figure(3); ...@@ -176,21 +175,23 @@ figure(3);
clf; clf;
hold on; hold on;
% vector signals ordering shoud not change on MDSplus, hence:
plot(demo1simout.demo1.signal6.Time, demo1simout.demo1.signal6.Data(:,1),'r'); plot(demo1simout.demo1.signal6.Time, demo1simout.demo1.signal6.Data(:,1),'r');
plot(demo1simout.demo1.signal6.Time, demo1simout.demo1.signal6.Data(:,2),'g'); plot(demo1simout.demo1.signal6.Time, demo1simout.demo1.signal6.Data(:,2),'g');
chkoffst=0.1; chkoffst=0.1;
plot(demo1signal6marte2.dim{1},demo1signal6marte2.data(1,:)+chkoffst,'r'); plot(demo1signal6marte2.dim{1},demo1signal6marte2.data(1,:)+chkoffst,'r');
plot(demo1signal6marte2.dim{1},demo1signal6marte2.data(2,:)+chkoffst,'g'); plot(demo1signal6marte2.dim{1},demo1signal6marte2.data(2,:)+chkoffst,'g');
xlim([0 3]); xlim([0 3]);
title('vector signal comparison');
%% Plot matrix signals %% Plot matrix signals
figure(4); figure(4);
clf; clf;
hold on; hold on;
% matrix signals should be stored as row-major encoded vectors on MDSplus,
% hence:
matsig=demo1simout.demo1.signal7; matsig=demo1simout.demo1.signal7;
plot(matsig.Time,reshape(matsig.Data(1,1,:),1,size(matsig.Data(1,1,:),3)'),'r'); plot(matsig.Time,reshape(matsig.Data(1,1,:),1,size(matsig.Data(1,1,:),3)'),'r');
plot(matsig.Time,reshape(matsig.Data(1,2,:),1,size(matsig.Data(1,2,:),3)'),'g'); plot(matsig.Time,reshape(matsig.Data(1,2,:),1,size(matsig.Data(1,2,:),3)'),'g');
...@@ -198,9 +199,7 @@ plot(matsig.Time,reshape(matsig.Data(1,3,:),1,size(matsig.Data(1,3,:),3)'),'b'); ...@@ -198,9 +199,7 @@ plot(matsig.Time,reshape(matsig.Data(1,3,:),1,size(matsig.Data(1,3,:),3)'),'b');
plot(matsig.Time,reshape(matsig.Data(2,1,:),1,size(matsig.Data(2,1,:),3)'),'k'); plot(matsig.Time,reshape(matsig.Data(2,1,:),1,size(matsig.Data(2,1,:),3)'),'k');
plot(matsig.Time,reshape(matsig.Data(2,2,:),1,size(matsig.Data(2,2,:),3)'),'m'); plot(matsig.Time,reshape(matsig.Data(2,2,:),1,size(matsig.Data(2,2,:),3)'),'m');
plot(matsig.Time,reshape(matsig.Data(2,3,:),1,size(matsig.Data(2,3,:),3)'),'c'); plot(matsig.Time,reshape(matsig.Data(2,3,:),1,size(matsig.Data(2,3,:),3)'),'c');
chkoffst=0.1; chkoffst=0.1;
plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(1,:)+chkoffst,'r'); plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(1,:)+chkoffst,'r');
plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(2,:)+chkoffst,'g'); plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(2,:)+chkoffst,'g');
plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(3,:)+chkoffst,'b'); plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(3,:)+chkoffst,'b');
...@@ -209,12 +208,4 @@ plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(5,:)+chkoffst,'m'); ...@@ -209,12 +208,4 @@ plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(5,:)+chkoffst,'m');
plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(6,:)+chkoffst,'c'); plot(demo1signal7marte2.dim{1},demo1signal7marte2.data(6,:)+chkoffst,'c');
xlim([0 3]); xlim([0 3]);
title('matrix signal comparison');
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment