Overview
Comment:Fixed range bug by using struct_contains in place of exists
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: 9c2f148f2f29c131fdfe6818c670aef8d5b441a2028269b56fbde64cfefe52f8
User & Date: gawthrop@users.sourceforge.net on 2003-05-08 18:46:45
Other Links: branch diff | manifest | tags
Context
2003-05-08
18:47:50
Fixed __ bug when using * representations check-in: 9259d5b445 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
18:46:45
Fixed range bug by using struct_contains in place of exists check-in: 9c2f148f2f user: gawthrop@users.sourceforge.net tags: origin/master, trunk
18:43:09
Generate pdf from ps (using hyperref package for links etc) check-in: 594befbf9c user: gawthrop@users.sourceforge.net tags: origin/master, trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified mttroot/mtt/bin/trans/dm2fr_m from [a15e80b520] to [302b8e2528].

︙︙
11
12
13
14
15
16
17



18
19
20
21
22
23
24

# Copyright (c) P.J.Gawthrop, 1996.

###############################################################
## Version control history
###############################################################
## $Id$
## $Log$



## Revision 1.13  1998/09/03 09:12:32  peterg
## Removed debugging lines
##
## Revision 1.12  1998/09/02 12:02:14  peterg
## Added mttinput paramater
##
## Revision 1.11  1998/08/11 13:32:42  peterg








>
>
>








11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27

# Copyright (c) P.J.Gawthrop, 1996.

###############################################################
## Version control history
###############################################################
## $Id$
## $Log$
## Revision 1.14  2000/05/20 15:35:18  peterg
## Parameterised version
##
## Revision 1.13  1998/09/03 09:12:32  peterg
## Removed debugging lines
##
## Revision 1.12  1998/09/02 12:02:14  peterg
## Added mttinput paramater
##
## Revision 1.11  1998/08/11 13:32:42  peterg
︙︙
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112


# Data
  mttpar=$1_numpar;

# Simulation parameters
  simpar=$1_simpar;

  [nx,ny,nu,nz,nyz] = $1_def

  %Defaults
  
  if exist('simpar.wmin')==0
    simpar.wmin = -1;
  end;

  if exist('simpar.wmax')==0
    simpar.wmax = 2;
  end;

  if exist('simpar.wsteps')==0
    simpar.wsteps = 100;
  end;

  W = logspace(simpar.wmin,simpar.wmax,simpar.wsteps)';
  if exist('mttinput')==0
    mttinput = 1;
  end;
  mttu0 = zeros(nu,1);
  mttu0(mttinput) = 1;

  [n,m]=size(W);
  if m>n








|



|



|
|


|




|








84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115


# Data
  mttpar=$1_numpar;

# Simulation parameters
  simpar=$1_simpar;

  [nx,ny,nu,nz,nyz] = $1_def;

  %Defaults
  
  if (struct_contains(simpar,"wmin")==0)
    simpar.wmin = -1;
  end;

  if (struct_contains(simpar,"wmax")==0)
    simpar.wmax = 2
  end;

  if (struct_contains(simpar,"wsteps")==0)
    simpar.wsteps = 100;
  end;

  W = logspace(simpar.wmin,simpar.wmax,simpar.wsteps)';
  if (struct_contains(simpar,"mttinput")==0)
    mttinput = 1;
  end;
  mttu0 = zeros(nu,1);
  mttu0(mttinput) = 1;

  [n,m]=size(W);
  if m>n
︙︙
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163

  [A,B,C,D,E] = $1_dm(mttpar);
  fr = dm2fr(A,B,C,D,E,W,mttu0);
  lw = log10(W);
  lmfr = log10(abs(fr));
  pfr = angle(fr)*180/pi;

% Complex frequency response
  write_matrix([W fr], '$1_fr');

% Log magnitude v log frequency
  write_matrix([lw lmfr], '$1_lmfr');

% Angle v log frequency
  write_matrix([lw pfr], '$1_lpfr');

% Nyquist style
  re = real(fr);
  im = imag(fr);
  nyq = [re(:,1) im(:,1)];
  for i = 2:ny
    nyq = [nyq re(:,i) im(:,i)];
  end;
  write_matrix(nyq, '$1_nyfr');

% Nichols style
  re = lmfr;
  im = pfr;
  nic = [im(:,1) re(:,1)];
  for i = 2:ny
    nic = [nic im(:,i) re(:,i)];
  end;
  write_matrix(nic, '$1_nifr');

EOF

# Now invoke the standard error handling.
mtt_error mtt_error.txt














|


|


|








|








|



|








124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166

  [A,B,C,D,E] = $1_dm(mttpar);
  fr = dm2fr(A,B,C,D,E,W,mttu0);
  lw = log10(W);
  lmfr = log10(abs(fr));
  pfr = angle(fr)*180/pi;

% Complex frequency response
  write_matrix([W fr], "$1_fr");

% Log magnitude v log frequency
  write_matrix([lw lmfr], "$1_lmfr");

% Angle v log frequency
  write_matrix([lw pfr], "$1_lpfr");

% Nyquist style
  re = real(fr);
  im = imag(fr);
  nyq = [re(:,1) im(:,1)];
  for i = 2:ny
    nyq = [nyq re(:,i) im(:,i)];
  end;
  write_matrix(nyq, "$1_nyfr");

% Nichols style
  re = lmfr;
  im = pfr;
  nic = [im(:,1) re(:,1)];
  for i = 2:ny
    nic = [nic im(:,i) re(:,i)];
  end;
  write_matrix(nic, "$1_nifr");

EOF

# Now invoke the standard error handling,"
mtt_error mtt_error.txt

MTT: Model Transformation Tools
[ GitHub | SourceHut | Sourceforge | Fossil RSS ]