From 8e6b3756dd720cdedd729bc4d0b555016634cee3 Mon Sep 17 00:00:00 2001 From: Jacques Grelet <jacques.grelet@ird.fr> Date: Tue, 17 Feb 2009 07:48:54 +0000 Subject: [PATCH] remove queue class --- @queue/display.m | 18 ---------------- @queue/get.m | 10 --------- @queue/isempty.m | 8 ------- @queue/push.m | 53 --------------------------------------------- @queue/queue.m | 56 ------------------------------------------------ @queue/redo.m | 22 ------------------- @queue/undo.m | 42 ------------------------------------ @queue/view.m | 10 --------- 8 files changed, 219 deletions(-) delete mode 100644 @queue/display.m delete mode 100644 @queue/get.m delete mode 100644 @queue/isempty.m delete mode 100644 @queue/push.m delete mode 100644 @queue/queue.m delete mode 100644 @queue/redo.m delete mode 100644 @queue/undo.m delete mode 100644 @queue/view.m diff --git a/@queue/display.m b/@queue/display.m deleted file mode 100644 index 5d9ca7c..0000000 --- a/@queue/display.m +++ /dev/null @@ -1,18 +0,0 @@ -function display(self) -%DISPLAY Display a queue table object -% display(queue) - -% Copyright (c) 2004 Matthew Krauski (mkrauski@uci.edu), CNLM, UC Irvine - -%isLoose = strcmp(get(0,'FormatSpacing'),'loose'); -isLoose = 0; - -if(length(inputname(1)) ~= 0) - if isLoose, disp(' '), end - disp( sprintf('%s =', inputname(1)) ); -end - -if isLoose, disp(' '), end - -disp(struct(self)); - diff --git a/@queue/get.m b/@queue/get.m deleted file mode 100644 index 2936a1c..0000000 --- a/@queue/get.m +++ /dev/null @@ -1,10 +0,0 @@ -function data = get(self) -%GET data from index position in queue, prepared from undo or redo methods -% usage -% data = get(queue) - -% $Id$ - -% return object prepared in data -% ------------------------------ -data = self.data; diff --git a/@queue/isempty.m b/@queue/isempty.m deleted file mode 100644 index 39cbfb8..0000000 --- a/@queue/isempty.m +++ /dev/null @@ -1,8 +0,0 @@ -function bool = isempty(self) -%ISEMPTY Check to see if the queue is empty -% bool = isempty(queue) - -% - -bool = isempty(self.data); - diff --git a/@queue/push.m b/@queue/push.m deleted file mode 100644 index febac9a..0000000 --- a/@queue/push.m +++ /dev/null @@ -1,53 +0,0 @@ -function self = push(self, object) -%PUSH put new object in queue -% queue = push(queue,object) -% -% $Id$ - -% if empty object, no action -% -------------------------- -if isempty(object) - return -end - -% if new entrie is equal to last entry, no action -% use short circuit operator, second expression (isequal) isn't evaluate -% if first expression (isempty) is true -% ----------------------------------------------- -if ~self.index || isempty(self.buffer) || ~isequal(object, self.buffer{self.index}) - - % increment internal index - % ------------------------ - self.index = self.index+1; - - % store new object at index - % ------------------------- - self.buffer{self.index} = object; - - % test if index reach end of buffer - % -------------------------------- - if self.index <= self.size - - % reset all data stored in buffer after index - % ------------------------------------------- - self.buffer(self.index+1:end) = []; - - % reset size - % ---------- - self.size = self.index; - - else - % increment size - % -------------- - self.size = self.size +1; - end - - % if an object was previously prepare in data with undo or redo, reset it - % ----------------------------------------------------------------------- - if ~isempty(self.data) - self.data = {}; - end - -else - return -end \ No newline at end of file diff --git a/@queue/queue.m b/@queue/queue.m deleted file mode 100644 index 68b67a7..0000000 --- a/@queue/queue.m +++ /dev/null @@ -1,56 +0,0 @@ -function queue = queue(varargin) -%QUEUE constructor for queue object -% usage: -% q = queue - Default constructor, empty queue table -% mq = queue(q) - Copy constructor -% -% example: -% q = queue -% q = push(q, [1:2]) -% q = push(q, ones(1,5)) -% q = undo(q) -% data = get(q) -% q = push(q, zeros(1,3)) -% etc ... -% -% $Id$ - -% todos: define maxSize dimension -% if nargin == 1 && isa(varargin{1},'integer') -% q.maxSize = varargin{1}; -% end -% and test maxSize in push - -% copy constructor -% ---------------- -if nargin == 1 && isa(varargin{1},'queue') - queue = varargin{1}; - return; - -% default constructor -% ------------------- -elseif nargin == 0 - - % current index inside of queue, change by undo & redo - % ---------------------------------------------------- - q.index = 0; - - % number of object currently stored - % --------------------------------- - q.size = 0; - - % buffer where objects are stored - % ------------------------------- - q.buffer = {}; - - % one object buffer, prepared by undo & redo methods and disposed for get method - % ----------------------------------------------------------------------- - q.data = {}; - -else - error('queue:queue', 'Invalid arguments.'); -end - -% class constructor -% ----------------- -queue = class(q,'queue'); diff --git a/@queue/redo.m b/@queue/redo.m deleted file mode 100644 index 0ff51ac..0000000 --- a/@queue/redo.m +++ /dev/null @@ -1,22 +0,0 @@ -function self = redo(self) -% REDO move up queue index and prepare return value for the next get -% method -% queue = redo(queue) -% -% $Id$ - -% reach end of queue -% ------------------ -if self.index == self.size - self.data = {}; - return -end - -% move index up -% --------------- -self.index = self.index + 1; - -% prepare (copy) data for get method -% ---------------------------------- -self.data = self.buffer{self.index}; - diff --git a/@queue/undo.m b/@queue/undo.m deleted file mode 100644 index 1b43b86..0000000 --- a/@queue/undo.m +++ /dev/null @@ -1,42 +0,0 @@ -function self = undo(self) -% UNDO move back queue index and prepare return value for the next get -% method -% queue = undo(queue) -% -% $Id$ - -% reach empty queue -% ----------------- -switch self.index - case 0 - - return - - case 1 - - % move index back - % --------------- - self.index = self.index - 1; - - % reset self.data - % --------------- - self.data = {}; - - % return, don't make any change - % ----------------------------- - return - - otherwise - % move index back - % --------------- - self.index = self.index - 1; - - % prepare (copy) data for get method - % ---------------------------------- - self.data = self.buffer{self.index}; -end - - - - - diff --git a/@queue/view.m b/@queue/view.m deleted file mode 100644 index d2cdec6..0000000 --- a/@queue/view.m +++ /dev/null @@ -1,10 +0,0 @@ -function data = view(self) -%VIEW - -% $Id$ - -self.index - -self.lifo - -self.data \ No newline at end of file -- GitLab