Skip to content

Commit

Permalink
renamed class
Browse files Browse the repository at this point in the history
  • Loading branch information
JayHuLBL committed Sep 21, 2023
1 parent 4117195 commit 0809e92
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ This block starts the PID tuning process when a request for performing autotunin
<code>false</code> to <code>true</code>.
During the autotuning process, the output of the block changes into that of a relay controller (see <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.Controller\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.Controller</a>).
The PID tuning process ends automatically (see details in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
The PID tuning process ends automatically (see details in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.BaseClasses.Relay.TunMonitor</a>).
Since then, this block turns back to a PID controller but with tuned PID parameters.
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
within Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses;
block TunMonitor "Monitor the tuning process"
block TuningMonitor "Monitor the tuning process"
Buildings.Controls.OBC.CDL.Interfaces.RealInput tOn(
final quantity="Time",
final unit="s",
Expand Down Expand Up @@ -157,4 +157,4 @@ or <code>t<sub>off</sub></code> changes after the tuning period starts, as illus
\"Automatic Controller Tuning using Relay-based Model Identification.\"
Department of Automatic Control, Lund Institute of Technology, Lund University. </p>
</html>"));
end TunMonitor;
end TuningMonitor;
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Validation test for the block
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.HalfPeriodRatio</a>.
</p>
<p>
This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor\">
This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor</a>.
The lengths of the On period and the Off period are sampled at <i>0.9</i>s to calculate the half period ratio.
</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
within Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation;
model TunMonitor "Test model for the tuning period management"
model TuningMonitor "Test model for the tuning period management"
Buildings.Controls.OBC.CDL.Reals.Sources.Pulse tOnSig1(
amplitude=-0.1,
width=0.1,
Expand All @@ -25,7 +25,7 @@ model TunMonitor "Test model for the tuning period management"
offset=0.5)
"The length of the Off period"
annotation (Placement(transformation(extent={{-80,-40},{-60,-20}})));
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor
tunMan "Manage the tuning process"
annotation (Placement(transformation(extent={{20,-10},{40,10}})));
Buildings.Controls.OBC.CDL.Logical.Latch tunSta "Display when tuning process starts"
Expand Down Expand Up @@ -56,7 +56,7 @@ equation
StopTime=1.0,
Tolerance=1e-06),
__Dymola_Commands(
file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TunMonitor.mos" "Simulate and plot"),
file="modelica://Buildings/Resources/Scripts/Dymola/Controls/OBC/Utilities/PIDWithAutotuning/Relay/BaseClasses/Validation/TuningMonitor.mos" "Simulate and plot"),
Icon(
coordinateSystem(
preserveAspectRatio=false,
Expand Down Expand Up @@ -84,8 +84,8 @@ First implementation<br/>
</html>", info="<html>
<p>
Validation test for the block
<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor</a>.
<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor</a>.
</p>
<ul>
<li>
Expand All @@ -102,4 +102,4 @@ This triggers the tuning period to end.
</li>
</ul>
</html>"));
end TunMonitor;
end TuningMonitor;
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ HalfPeriodRatio
NormalizedTimeDelay
OnOffPeriod
SamplerWithResetThreshold
TunMonitor
TuningMonitor
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ HalfPeriodRatio
NormalizedTimeDelay
OnOffPeriod
SamplerWithResetThreshold
TunMonitor
TuningMonitor
Validation
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ block Controller
"Control error"
annotation (Placement(transformation(extent={{100,0},{140,40}}),
iconTransformation(extent={{100,-20},{140,20}})));

protected
Buildings.Controls.OBC.CDL.Logical.OnOffController greMeaSet(
final bandwidth=deaBan*2,
Expand Down Expand Up @@ -121,8 +121,8 @@ equation
fillPattern=FillPattern.Solid,
fillColor={175,175,175},
textString="Relay"),
Line(points={{-70,24},{-34,24},{-34,58},{38,58},{38,24},{66,24}}, color=
{28,108,200})}), Diagram(
Line(points={{-70,24},{-34,24},{-34,58},{38,58},{38,24},{66,24}}, color
={28,108,200})}), Diagram(
coordinateSystem(preserveAspectRatio=false)),
Documentation(info="<html>
<p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ protected
final gamma=max(yHig, yLow)/min(yLow, yHig))
"Block that calculates the normalized time delay"
annotation (Placement(transformation(extent={{40,0},{60,20}})));
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor TunMon
"Block that detects when the tuning period starts and ends"
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor
TunMon "Block that detects when the tuning period starts and ends"
annotation (Placement(transformation(extent={{-40,-40},{-20,-20}})));

equation
Expand Down Expand Up @@ -153,8 +153,8 @@ Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.NormalizedT
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.OnOffPeriod</a>.
</li>
<li>
<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TunMonitor</a>.
<a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.TuningMonitor</a>.
</li>
</ul>
</html>"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Validation test for the block
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.ResponseProcess</a>.
</p>
<p>
This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor\">
This testing scenario in this example is the same as that in <a href=\"modelica://Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor\">
Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor</a>.
</p>
</html>"));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
simulateModel("Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TunMonitor", method="Cvode", tolerance=1e-06,resultFile="TunMonitor");
createPlot(id=1, position={0, 0, 1392, 452}, y={"tOn.y", "tOff.y"}, range={0.0, 1.0, -0.2, 0.6000000000000001}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}});
createPlot(id=1, position={0, 0, 1392, 452}, y={"tunSta.y", "tunEnd.y"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});
simulateModel("Buildings.Controls.OBC.Utilities.PIDWithAutotuning.Relay.BaseClasses.Validation.TuningMonitor", method="Cvode", tolerance=1e-06,resultFile="TunMonitor");
createPlot(id=1, position={0, 0, 1392, 452}, y={"tOn.y", "tOff.y"}, range={0.0, 1.0, -0.2, 0.6}, grid=true, subPlot=101, colors={{28,108,200}, {238,46,47}});
createPlot(id=1, position={0, 0, 1392, 452}, y={"tunSta.y", "tunEnd.y"}, range={0.0, 1.0, -0.5, 1.5}, grid=true, subPlot=102, colors={{28,108,200}, {28,108,200}});

0 comments on commit 0809e92

Please sign in to comment.