[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/MatlabHLA_Toolbox/demo/TwoLevelCon...
|
From: |
certi-cvs |
|
Subject: |
[certi-cvs] applications/MatlabHLA_Toolbox/demo/TwoLevelCon... |
|
Date: |
Sat, 07 Jun 2008 14:20:23 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Christian Stenzel <approx> 08/06/07 14:20:22
Modified files:
MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime:
controlFed.m
MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime:
processFed.m
Added files:
MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime:
timeConstrEnabled.m
timeRegEnabled.m
MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime:
timeConstrEnabled.m
timeRegEnabled.m
Log message:
some changes in the demo apps in MatlabHLA_Toolbox
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime/controlFed.m?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime/timeConstrEnabled.m?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime/timeRegEnabled.m?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime/processFed.m?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime/timeConstrEnabled.m?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime/timeRegEnabled.m?cvsroot=certi&rev=1.1
Patches:
Index: controlFed_wTime/controlFed.m
===================================================================
RCS file:
/sources/certi/applications/MatlabHLA_Toolbox/demo/TwoLevelController/controlFed_wTime/controlFed.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- controlFed_wTime/controlFed.m 28 Jan 2008 21:46:21 -0000 1.1
+++ controlFed_wTime/controlFed.m 7 Jun 2008 14:20:20 -0000 1.2
@@ -79,12 +79,32 @@
global newTimeStep
newTimeStep = false
+global TCE
+global TRE
+
+TCE = false
+TRE = false
+
disp('Init time management features.')
+e = enableAsyncDeliv
e = enableTimeConstr
+while ~TCE
+ tick();
+ pause(0.1)
+end
+TCE = false;
+disp('time constrained enabled')
+
e = enableTimeReg(tStart, h)
+while ~TRE
+ tick();
+ pause(0.1)
+end
+TRE = false;
+disp('time regulation enabled')
-e = enableAsyncDeliv
+modifyLookahead(h);
tFed = queryFedTime()
Index: processFed_wTime/processFed.m
===================================================================
RCS file:
/sources/certi/applications/MatlabHLA_Toolbox/demo/TwoLevelController/processFed_wTime/processFed.m,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- processFed_wTime/processFed.m 28 Jan 2008 21:46:22 -0000 1.1
+++ processFed_wTime/processFed.m 7 Jun 2008 14:20:21 -0000 1.2
@@ -80,12 +80,31 @@
global newTimeStep
newTimeStep = false
+global TCE
+TCE = false
+global TRE
+TRE = false
+
disp('Init time management features.')
+e = enableAsyncDeliv
e = enableTimeConstr
+while ~TCE
+ tick();
+ pause(0.1)
+end
+TCE = false;
+disp('time constrained enabled')
+
e = enableTimeReg(tStart, h)
+while ~TRE
+ tick();
+ pause(0.1)
+end
+TRE = false;
+disp('time regulation enabled')
-e = enableAsyncDeliv
+modifyLookahead(h);
disp('Wait for u')
while ~discoverU
Index: controlFed_wTime/timeConstrEnabled.m
===================================================================
RCS file: controlFed_wTime/timeConstrEnabled.m
diff -N controlFed_wTime/timeConstrEnabled.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ controlFed_wTime/timeConstrEnabled.m 7 Jun 2008 14:20:21 -0000
1.1
@@ -0,0 +1,51 @@
+function timeConstrEnabled(theFederateTime)
+%timeConstrEnabled Time Constrained Enabled (rti initiated).
+%
+%Synopsis:
+% timeConstrEnabled(theFederateTime)
+%
+%Purpose:
+
+% throw (
+% InvalidFederationTime,
+% EnableTimeConstrainedWasNotPending,
+% FederateInternalError)
+
+% Copyright (C) 2008 Christian Stenzel, Sven Pawletta, Thorsten Pawletta
+
+% This file is part of MatlabHLA13.
+%
+% MatlabHLA13 is free software: you can redistribute it and/or
+% modify it under the terms of the GNU Lesser General Public
+% License as published by the Free Software Foundation, either
+% version 3 of the License, or (at your option) any later version.
+%
+% MatlabHLA13 is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU Lesser General Public License for more details.
+%
+% You should have received a copy of the GNU Lesser General Public
+% License along with MatlabHLA13.
+%
+% If not, see <http://www.gnu.org/licenses/>.
+global TCE
+
+TCE = true;
+
+return
+
+
+cmd='';
+
+while ~strcmp(cmd,'return')
+ cmd = input('(NULL) timeConstrEnabled>> ','s');
+ eval(cmd,'error_handler')
+end
+
+return
+
+
+function error_handler()
+ disp(lasterr)
+return
Index: controlFed_wTime/timeRegEnabled.m
===================================================================
RCS file: controlFed_wTime/timeRegEnabled.m
diff -N controlFed_wTime/timeRegEnabled.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ controlFed_wTime/timeRegEnabled.m 7 Jun 2008 14:20:21 -0000 1.1
@@ -0,0 +1,51 @@
+function timeRegEnabled(theFederateTime)
+%timeRegEnabled Time Regulation Enabled (rti initiated).
+%
+%Synopsis:
+% timeRegEnabled(theFederateTime)
+%
+%Purpose:
+
+% throw (
+% InvalidFederationTime,
+% EnableTimeRegulationWasNotPending,
+% FederateInternalError)
+
+% Copyright (C) 2008 Christian Stenzel, Sven Pawletta, Thorsten Pawletta
+
+% This file is part of MatlabHLA13.
+%
+% MatlabHLA13 is free software: you can redistribute it and/or
+% modify it under the terms of the GNU Lesser General Public
+% License as published by the Free Software Foundation, either
+% version 3 of the License, or (at your option) any later version.
+%
+% MatlabHLA13 is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU Lesser General Public License for more details.
+%
+% You should have received a copy of the GNU Lesser General Public
+% License along with MatlabHLA13.
+%
+% If not, see <http://www.gnu.org/licenses/>.
+global TRE
+
+TRE = true;
+
+return
+
+
+cmd='';
+
+while ~strcmp(cmd,'return')
+ cmd = input('(NULL) timeRegEnabled>> ','s');
+ eval(cmd,'error_handler')
+end
+
+return
+
+
+function error_handler()
+ disp(lasterr)
+return
Index: processFed_wTime/timeConstrEnabled.m
===================================================================
RCS file: processFed_wTime/timeConstrEnabled.m
diff -N processFed_wTime/timeConstrEnabled.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ processFed_wTime/timeConstrEnabled.m 7 Jun 2008 14:20:22 -0000
1.1
@@ -0,0 +1,51 @@
+function timeConstrEnabled(theFederateTime)
+%timeConstrEnabled Time Constrained Enabled (rti initiated).
+%
+%Synopsis:
+% timeConstrEnabled(theFederateTime)
+%
+%Purpose:
+
+% throw (
+% InvalidFederationTime,
+% EnableTimeConstrainedWasNotPending,
+% FederateInternalError)
+
+% Copyright (C) 2008 Christian Stenzel, Sven Pawletta, Thorsten Pawletta
+
+% This file is part of MatlabHLA13.
+%
+% MatlabHLA13 is free software: you can redistribute it and/or
+% modify it under the terms of the GNU Lesser General Public
+% License as published by the Free Software Foundation, either
+% version 3 of the License, or (at your option) any later version.
+%
+% MatlabHLA13 is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU Lesser General Public License for more details.
+%
+% You should have received a copy of the GNU Lesser General Public
+% License along with MatlabHLA13.
+%
+% If not, see <http://www.gnu.org/licenses/>.
+global TCE
+
+TCE = true;
+
+return
+
+
+cmd='';
+
+while ~strcmp(cmd,'return')
+ cmd = input('(NULL) timeConstrEnabled>> ','s');
+ eval(cmd,'error_handler')
+end
+
+return
+
+
+function error_handler()
+ disp(lasterr)
+return
Index: processFed_wTime/timeRegEnabled.m
===================================================================
RCS file: processFed_wTime/timeRegEnabled.m
diff -N processFed_wTime/timeRegEnabled.m
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ processFed_wTime/timeRegEnabled.m 7 Jun 2008 14:20:22 -0000 1.1
@@ -0,0 +1,51 @@
+function timeRegEnabled(theFederateTime)
+%timeRegEnabled Time Regulation Enabled (rti initiated).
+%
+%Synopsis:
+% timeRegEnabled(theFederateTime)
+%
+%Purpose:
+
+% throw (
+% InvalidFederationTime,
+% EnableTimeRegulationWasNotPending,
+% FederateInternalError)
+
+% Copyright (C) 2008 Christian Stenzel, Sven Pawletta, Thorsten Pawletta
+
+% This file is part of MatlabHLA13.
+%
+% MatlabHLA13 is free software: you can redistribute it and/or
+% modify it under the terms of the GNU Lesser General Public
+% License as published by the Free Software Foundation, either
+% version 3 of the License, or (at your option) any later version.
+%
+% MatlabHLA13 is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+% GNU Lesser General Public License for more details.
+%
+% You should have received a copy of the GNU Lesser General Public
+% License along with MatlabHLA13.
+%
+% If not, see <http://www.gnu.org/licenses/>.
+global TRE
+
+TRE = true;
+
+return
+
+
+cmd='';
+
+while ~strcmp(cmd,'return')
+ cmd = input('(NULL) timeRegEnabled>> ','s');
+ eval(cmd,'error_handler')
+end
+
+return
+
+
+function error_handler()
+ disp(lasterr)
+return
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/MatlabHLA_Toolbox/demo/TwoLevelCon...,
certi-cvs <=