matlab/@dseries/frequency.m

+function f = frequency(o)
+
+% Copyright (C) 2014 Dynare Team
+%
+% This file is part of Dynare.
+%
+% Dynare is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Dynare 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 General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
+f = o.dates.freq;
\ No newline at end of file

matlab/@dseries/horzcat.m

@@ -51,14 +51,21 @@ end
 
 function a = concatenate(b,c)
     [n,message] = common_strings_in_cell_arrays(b.name,c.name);
+    if isempty(b)
+        a = c;
+        return
+    end
+    if isempty(c)
+        a = b;
+        return
+    end
     if n
         error(['dseries::horzcat: I cannot concatenate dseries objects with common variable names (' message ')!'])
     end
-    if ~isequal(b.freq,c.freq)
+    if ~isequal(frequency(b),frequency(c))
         error('dseries::horzcat: All time series objects must have common frequency!')
     else
         a = dseries();
-        a.freq = b.freq;
     end
     d_nobs_flag = 0;
     if ~isequal(b.nobs,c.nobs)
@@ -67,29 +74,26 @@ function a = concatenate(b,c)
         a.nobs = b.nobs;
     end
     d_init_flag = 0;
-    if ~isequal(b.init,c.init)
+    if ~isequal(firstdate(b),firstdate(c))
         d_init_flag = 1;
     end
     a.vobs = b.vobs+c.vobs;
     a.name = vertcat(b.name,c.name);
     a.tex  = vertcat(b.tex,c.tex);
     if ~( d_nobs_flag(1) || d_init_flag(1) )
-        a.init = b.init;
         a.data = [b.data,c.data];
         a.dates = b.dates;
     else
-        if b.init<=c.init
-            a.init = b.init;
-            if b.init<c.init
-                c.data = [NaN(c.init-b.init,c.vobs); c.data];
+        if firstdate(b)<=firstdate(c)
+            if firstdate(b)<firstdate(c)
+                c.data = [NaN(firstdate(c)-firstdate(b),c.vobs); c.data];
             end
         else
-            a.init = c.init;
-            b_first_lines = b.init-c.init;
-            b.data = [NaN(b.init-c.init,b.vobs); b.data];
+            b_first_lines = firstdate(b)-firstdate(c);
+            b.data = [NaN(firstdate(b)-firstdate(c),b.vobs); b.data];
         end
-        b_last_date = b.init+b.nobs;
-        c_last_date = c.init+c.nobs;
+        b_last_date = firstdate(b)+b.nobs;
+        c_last_date = firstdate(c)+c.nobs;
         if b_last_date<c_last_date
             b.data = [b.data; NaN(c_last_date-b_last_date,b.vobs)];
         elseif b_last_date>c_last_date
@@ -289,3 +293,28 @@ function a = concatenate(b,c)
 %$
 %$ T = t;
 %@eof:6
+
+%@test:7
+%$ % Define X
+%$ X = randn(30,2);
+%$
+%$ % Instantiate two time series objects.
+%$ ts1 = dseries();
+%$ ts2 = dseries(randn(30,2),'1950Q2');
+%$
+%$ % Call the tested method.
+%$ try
+%$   ts3 = [ts1,ts2];
+%$   t = 1;
+%$ catch
+%$   t = 0;
+%$ end
+%$
+%$ if t(1)
+%$   t(2) = dyn_assert(ts3.freq,4);
+%$   t(3) = dyn_assert(ts3.data,X);
+%$   t(4) = dyn_assert(isequal(ts3.dates(1),dates('1950Q2')),1);
+%$ end
+%$
+%$ T = t;
+%@eof:7

matlab/@dseries/insert.m

@@ -52,7 +52,7 @@ if n
     error(['dseries::insert: Variable(s) ' message ' already exist in ''' inputname(1) '''!'])
 end
 
-if ~isequal(ts.freq,us.freq)
+if ~isequal(frequency(ts),frequency(us))
     error(['dseries::insert: ''' inputname(1) ''' and ''' inputname(2) ''' dseries objects must have common frequencies!'])
 end
 

matlab/@dseries/isequal.m

@@ -44,12 +44,12 @@ if ~isequal(A.vobs,B.vobs)
     return
 end
 
-if ~isequal(A.freq,B.freq)
+if ~isequal(frequency(A),frequency(B))
     C = 0;
     return
 end
 
-if ~isequal(A.init,B.init)
+if ~isequal(A.dates,B.dates)
     C = 0;
     return
 end

matlab/@dseries/lastdate.m

+function l = lastdate(o)
+
+% Copyright (C) 2014 Dynare Team
+%
+% This file is part of Dynare.
+%
+% Dynare is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Dynare 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 General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
+l = o.dates(end);
\ No newline at end of file

matlab/@dseries/merge.m

@@ -44,12 +44,11 @@ if ~isdseries(C)
     error('dseries::merge: Both inputs must be dseries objects!')
 end
 
-if ~isequal(B.freq,C.freq)
+if ~isequal(frequency(B),frequency(C))
     error(['dseries::merge: Cannot merge ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
 end
 
 A = dseries();
-A.freq = B.freq;
 [A.name, IBC, junk] = unique([B.name; C.name], 'last');
 tex = [B.tex; C.tex];
 A.tex = tex(IBC); 
@@ -59,8 +58,8 @@ if B.nobs == 0
     A = C;
 elseif C.nobs == 0
     A = B;
-elseif B.init >= C.init
-    diff = B.init - C.init;
+elseif firstdate(B) >= firstdate(C)
+    diff = firstdate(B) - firstdate(C);
     A.nobs = max(B.nobs + diff, C.nobs);
     A.data = NaN(A.nobs, A.vobs);
     Z1 = [NaN(diff,B.vobs);B.data];
@@ -68,14 +67,14 @@ elseif B.init >= C.init
         Z1 = [Z1; NaN(A.nobs-(B.nobs + diff),B.vobs)];
     end;
     Z2 = C.data;
-    if A.nobs > C.nobs 
+    if A.nobs > C.nobs
         Z2 = [Z2; NaN(A.nobs - C.nobs,C.vobs)];
     end;
     Z = [Z1 Z2];
     A.data = Z(:,IBC);
-    A.init = C.init;
+    A_init = firstdate(C);
 else
-    diff = C.init - B.init;
+    diff = firstdate(C) - firstdate(B);
     A.nobs = max(C.nobs + diff, B.nobs);
     A.data = NaN(A.nobs, A.vobs);
     Z1 = [NaN(diff,C.vobs);C.data];
@@ -88,10 +87,10 @@ else
     end;
     Z = [Z2 Z1];
     A.data = Z(:,IBC);
-    A.init = B.init;
+    A_init = B.init;
 end
 
-A.dates = A.init:A.init+(A.nobs-1);
+A.dates = A_init:A_init+(A.nobs-1);
 
 %@test:1
 %$ % Define a datasets.

matlab/@dseries/minus.m

@@ -73,11 +73,11 @@ else
     end
 end
 
-if ~isequal(B.freq,C.freq)
+if ~isequal(frequency(B),frequency(C))
     error(['dseries::plus: Cannot substract ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
 end
 
-if ~isequal(B.nobs,C.nobs) || ~isequal(B.init,C.init)
+if ~isequal(B.nobs,C.nobs) || ~isequal(firstdate(B),firstdate(C))
     [B, C] = align(B, C);
 end
 
@@ -93,8 +93,6 @@ end
 
 A = dseries();
 
-A.freq = B.freq;
-A.init = B.init;
 A.dates = B.dates;
 A.nobs = max(B.nobs,C.nobs);
 A.vobs = max(B.vobs,C.vobs);

matlab/@dseries/mpower.m

@@ -40,10 +40,26 @@ function A = mpower(B,C) % --*-- Unitary tests --*--
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-if isdseries(B) && isnumeric(C) && isreal(C) && isscalar(C)
+if isnumeric(B) && isvector(B) && length(B)>1
+    if ~isdseries(C)
+        error('dseries::mpower: Second input argument must be a dseries object!')
+    end
+    A = C;
+    A.data = bsxfun(@power,C.data,B);
+    return;
+end
+
+if isnumeric(C) && isvector(C) && length(C)>1
+    if ~isdseries(B)
+        error('dseries::mpower: First input argument must be a dseries object!')
+    end
+    A = B;
+    A.data = bsxfun(@power,B.data,C);
+    return
+end
+
+if isdseries(B) && isnumeric(C) && isreal(C) &&  isscalar(C)
     A = dseries();
-    A.freq = B.freq;
-    A.init = B.init;
     A.dates = B.dates;
     A.nobs = B.nobs;
     A.vobs = B.vobs;
@@ -58,10 +74,8 @@ if isdseries(B) && isnumeric(C) && isreal(C) && isscalar(C)
 end
 
 if isdseries(B) && isdseries(C)
-    if isequal(B.nobs,C.nobs) && isequal(B.vobs,C.vobs) && isequal(B.freq,C.freq)
+    if isequal(B.nobs,C.nobs) && isequal(B.vobs,C.vobs) && isequal(frequency(B),frequency(C))
         A = dseries();
-        A.freq = B.freq;
-        A.init = B.init;
         A.dates = B.dates;
         A.nobs = B.nobs;
         A.vobs = B.vobs;
@@ -133,4 +147,26 @@ error(['dseries::mpower: Wrong calling sequence!'])
 %$    t(6) = dyn_assert(ts3.tex,{'A1^2';'A2^2'});
 %$ end
 %$ T = all(t);
-%@eof:2
+%@eof:2
\ No newline at end of file
+
+%@test:3
+%$ % Define a dseries object
+%$ ts1=dseries([1 1;2 2;3 3], '1999y', {'MyVar1','MyVar2'});
+%$
+%$ % Use the power
+%$ try
+%$    ts2 = ts1^transpose(1:3);
+%$    t = 1;
+%$ catch
+%$    t = 0;
+%$ end
+%$
+%$ if t(1)
+%$    t(2) = dyn_assert(ts2.vobs,2);
+%$    t(3) = dyn_assert(ts2.nobs,3);
+%$    t(4) = dyn_assert(ts2.data,bsxfun(@power,ts1.data,transpose(1:3)),1e-15);
+%$    t(5) = dyn_assert(ts2.name,{'MyVar1';'MyVar2'});
+%$    t(6) = dyn_assert(ts2.tex,{'MyVar1';'MyVar2'});
+%$ end
+%$ T = all(t);
+%@eof:3
\ No newline at end of file

matlab/@dseries/mrdivide.m

@@ -74,15 +74,13 @@ if isdseries(B) && isdseries(C)
             idC = 1:C.vobs;
         end
     end
-    if ~isequal(B.freq,C.freq)
+    if ~isequal(frequency(B),frequency(C))
         error(['dseries::times: Cannot divide ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
     end
-    if ~isequal(B.nobs,C.nobs) || ~isequal(B.init,C.init)
+    if ~isequal(B.nobs,C.nobs) || ~isequal(firstdate(B),firstdate(C))
         [B, C] = align(B, C);
     end
     A = dseries();
-    A.freq = B.freq;
-    A.init = B.init;
     A.dates = B.dates;
     A.nobs = max(B.nobs,C.nobs);
     A.vobs = max(B.vobs,C.vobs);

matlab/@dseries/mtimes.m

@@ -74,15 +74,13 @@ if isdseries(B) && isdseries(C)
             idC = 1:C.vobs;
         end
     end
-    if ~isequal(B.freq,C.freq)
+    if ~isequal(frequency(B),frequency(C))
         error(['dseries::times: Cannot multiply ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
     end
-    if ~isequal(B.nobs,C.nobs) || ~isequal(B.init,C.init)
+    if ~isequal(B.nobs,C.nobs) || ~isequal(firstdate(B),firstdate(C))
         [B, C] = align(B, C);
     end
     A = dseries();
-    A.freq = B.freq;
-    A.init = B.init;
     A.dates = B.dates;
     A.nobs = max(B.nobs,C.nobs);
     A.vobs = max(B.vobs,C.vobs);

matlab/@dseries/ne.m

@@ -38,35 +38,35 @@ if ~(isdseries(A) && isdseries(B))
 end
 
 if ~isequal(A.nobs,B.nobs)
-    warning('dseries::eq: Both input arguments should have the same number of observations!')
+    warning('dseries::ne: Both input arguments should have the same number of observations!')
     C = 1;
     return
 end
 
 if ~isequal(A.vobs,B.vobs)
-    warning('dseries::eq: Both input arguments should have the same number of observations!')
+    warning('dseries::ne: Both input arguments should have the same number of observations!')
     C = 1;
     return
 end
 
-if ~isequal(A.freq,B.freq)
-    warning('dseries::eq: Both input arguments should have the same frequencies!')
+if ~isequal(frequency(A),frequency(B))
+    warning('dseries::ne: Both input arguments should have the same frequencies!')
     C = 1;
     return
 end
 
-if ~isequal(A.init,B.init)
-    warning('dseries::eq: Both input arguments should have the same initial period!')
+if ~isequal(firstdate(A),firstdate(B))
+    warning('dseries::ne: Both input arguments should have the same initial period!')
     C = 1;
     return
 end
 
 if ~isequal(A.name,B.name)
-    warning('dseries::eq: Both input arguments do not have the same variables!')
+    warning('dseries::ne: Both input arguments do not have the same variables!')
 end
 
 if ~isequal(A.tex,B.tex)
-    warning('dseries::eq: Both input arguments do not have the same tex names!')
+    warning('dseries::ne: Both input arguments do not have the same tex names!')
 end
 
 C = ne(A.data, B.data);

matlab/@dseries/plus.m

@@ -73,11 +73,11 @@ else
     end
 end
 
-if ~isequal(B.freq,C.freq)
+if ~isequal(frequency(B),frequency(C))
     error(['dseries::plus: Cannot add ' inputname(1) ' and ' inputname(2) ' (frequencies are different)!'])
 end
 
-if ~isequal(B.nobs,C.nobs) || ~isequal(B.init,C.init)
+if ~isequal(B.nobs,C.nobs) || ~isequal(firstdate(B),firstdate(C))
     [B, C] = align(B, C);
 end
 
@@ -93,8 +93,9 @@ end
 
 A = dseries();
 
-A.freq = B.freq;
-A.init = B.init;
+A.dates = B.dates;
+%A.freq = B.freq;
+%A.init = B.init;
 A.nobs = max(B.nobs,C.nobs);
 A.vobs = max(B.vobs,C.vobs);
 A.name = cell(A.vobs,1);
@@ -104,7 +105,7 @@ for i=1:A.vobs
     A.tex(i) = {['(' B.tex{idB(i)} '+' C.tex{idC(i)} ')']};
 end
 A.data = bsxfun(@plus,B.data,C.data);
-A.dates = A.init:A.init+(A.nobs-1);
+%A.dates = A.init:A.init+(A.nobs-1);
 
 %@test:1
 %$ % Define a datasets.

matlab/@dseries/qdiff.m

@@ -41,7 +41,7 @@ function us = qdiff(ts) % --*-- Unitary tests --*--
 
 us = ts;
 
-switch ts.freq
+switch frequency(ts)
   case 1
     error('dseries::qgrowth: I cannot compute quaterly differences from yearly data!')
   case 4

matlab/@dseries/qgrowth.m

@@ -41,7 +41,7 @@ function us = qgrowth(ts) % --*-- Unitary tests --*--
 
 us = ts;
 
-switch ts.freq
+switch frequency(ts)
   case 1
     error('dseries::qgrowth: I cannot compute quaterly growth rates from yearly data!')
   case 4

matlab/@dseries/remove.m

+function ts = remove(ts,a) % --*-- Unitary tests --*--
+
+% Removes a variable from a dseries object (alias for the pop method).
+
+%@info:
+%! @deftypefn {Function File} {@var{ts} =} pop (@var{ts}, @var{a})
+%! @anchor{dseries/pop}
+%! @sp 1
+%! Remove method for the dseries class. Removes a variable from a dseries object.
+%! @sp 2
+%! @strong{Inputs}
+%! @sp 1
+%! @table @ @var
+%! @item ts
+%! Object instantiated by @ref{dseries}.
+%! @item a
+%! String, name of the variable to be removed.
+%! @end table
+%! @sp 2
+%! @strong{Outputs}
+%! @sp 1
+%! @table @ @var
+%! @item ts
+%! Object instantiated by @ref{dseries}, without variable (@var{a}).
+%! @end table
+%! @end deftypefn
+%@eod:
+
+% Copyright (C) 2014 Dynare Team
+%
+% This file is part of Dynare.
+%
+% Dynare is free software: you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation, either version 3 of the License, or
+% (at your option) any later version.
+%
+% Dynare 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 General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
+
+ts = pop(ts, a);
+
+%@test:1
+%$ % Define a datasets.
+%$ A = rand(10,3);
+%$
+%$ % Define names
+%$ A_name = {'A1';'A2';'A3'};
+%$
+%$ t = zeros(4,1);
+%$
+%$ % Instantiate a time series object.
+%$ try
+%$    ts1 = dseries(A,[],A_name,[]);
+%$    ts2 = remove(ts1,'A2');
+%$    t(1) = 1;
+%$ catch
+%$    t = 0;
+%$ end
+%$
+%$ if length(t)>1
+%$    t(2) = dyn_assert(ts2.vobs,2);
+%$    t(3) = dyn_assert(ts2.nobs,10);
+%$    t(4) = dyn_assert(ts2.data,[A(:,1), A(:,3)],1e-15);
+%$ end
+%$ T = all(t);
+%@eof:1
+
+%@test:2
+%$ % Define a datasets.
+%$ A = rand(10,3);
+%$
+%$ % Define names
+%$ A_name = {'A1';'A2';'A3'};
+%$
+%$ t = zeros(4,1);
+%$
+%$ % Instantiate a time series object.
+%$ try
+%$    ts1 = dseries(A,[],A_name,[]);
+%$    ts2 = ts1.remove('A2');
+%$    t(1) = 1;
+%$ catch
+%$    t = 0;
+%$ end
+%$
+%$ if length(t)>1
+%$    t(2) = dyn_assert(ts2.vobs,2);
+%$    t(3) = dyn_assert(ts2.nobs,10);
+%$    t(4) = dyn_assert(ts2.data,[A(:,1), A(:,3)],1e-15);
+%$ end
+%$ T = all(t);
+%@eof:2
\ No newline at end of file

matlab/@dseries/save.m

@@ -35,8 +35,8 @@ switch format
     fid = fopen([basename, '.m'],'w');
     fprintf(fid,'%% File created on %s.\n',datestr(now));
     fprintf(fid,'\n');
-    fprintf(fid,'FREQ__ = %s;\n',num2str(A.freq));
-    fprintf(fid,'INIT__ = '' %s'';\n',date2string(A.init));
+    fprintf(fid,'FREQ__ = %s;\n',num2str(frequency(A)));
+    fprintf(fid,'INIT__ = '' %s'';\n',date2string(firstdate(A)));
     fprintf(fid,'\n');
     fprintf(fid,'NAMES__ = {');
     for i=1:A.vobs
@@ -61,8 +61,8 @@ switch format
     end
     fclose(fid);
   case 'mat'
-    FREQ__ = A.freq;
-    INIT__ = date2string(A.init);
+    FREQ__ = frequency(A);
+    INIT__ = date2string(firstdate(A));
     NAMES__ = A.name;
     TEX__ = A.tex;
     str = [];

matlab/@dseries/subsasgn.m

@@ -25,7 +25,7 @@ function A = subsasgn(A,S,B) % --*-- Unitary tests --*--
 % You should have received a copy of the GNU General Public License
 % along with Dynare.  If not, see <http://www.gnu.org/licenses/>.
 
-merge_dseries_objects = 1;    
+merge_dseries_objects = 1;
 
 switch length(S)
     case 1
@@ -77,6 +77,12 @@ switch length(S)
                   end
               end
           end
+          if isempty(B)
+              for i=1:length(S(1).subs)
+                  A = remove(A,S(1).subs{i});
+              end
+              return
+          end
           if ~isequal(length(S(1).subs),B.vobs)
               error('dseries::subsasgn: Wrong syntax!')
           end
@@ -99,20 +105,14 @@ switch length(S)
           end
         case '.'
           if isequal(S(1).subs,'init') && isdates(B) && isequal(length(B),1)
-              % Overwrite the init member...
-              A.init = B;
-              % ... and update freq and time members.
-              A.freq = A.init.freq;
-              A.dates = A.init:A.init+(A.nobs-1);
+              % Change the initial date (update dates member)
+              A.dates = B:B+(A.nobs-1);
               return
           elseif isequal(S(1).subs,'dates') && isdates(B)
-              % Overwrite the time member...
+              % Overwrite the dates member
               A.dates = B;
-              % ... and update the freq and init members.
-              A.init = B(1);
-              A.freq = A.init.freq;
               return
-          elseif ismember(S(1).subs,{'freq','nobs','vobs','data','name','tex'})
+          elseif ismember(S(1).subs,{'nobs','vobs','data','name','tex'})
               error(['dseries::subsasgn: You cannot overwrite ' S(1).subs ' member!'])
           elseif ~isequal(S(1).subs,B.name)
               % Single variable selection.
@@ -211,7 +211,7 @@ switch length(S)
         else
             sA = extract(A,S(1).subs);
         end
-        if (isdseries(B) && isequal(sA.vobs,B.vobs)) || (isnumeric(B) && isequal(sA.vobs,columns(B))) || (isnumeric(B) && isequal(columns(B),1)) 
+        if (isdseries(B) && isequal(sA.vobs,B.vobs)) || (isnumeric(B) && isequal(sA.vobs,columns(B))) || (isnumeric(B) && isequal(columns(B),1))
             if isdates(S(2).subs{1})
                 [junk, tdx] = intersect(sA.dates.time,S(2).subs{1}.time,'rows');
                 if isdseries(B)
@@ -278,8 +278,8 @@ end
 %$     t(1) = 1;
 %$ catch
 %$     t(1) = 0;
-%$ end 
-%$ 
+%$ end
+%$
 %$ % Instantiate a time series object.
 %$ if t(1)
 %$    t(2) = dyn_assert(ts1.vobs,3);
@@ -440,8 +440,8 @@ end
 %$     t(1) = 1;
 %$ catch
 %$     t(1) = 0;
-%$ end 
-%$ 
+%$ end
+%$
 %$ % Instantiate a time series object.
 %$ if t(1)
 %$    t(2) = dyn_assert(ts1.vobs,4);
@@ -469,8 +469,8 @@ end
 %$     t(1) = 1;
 %$ catch
 %$     t(1) = 0;
-%$ end 
-%$ 
+%$ end
+%$
 %$ % Instantiate a time series object.
 %$ if t(1)
 %$    t(2) = dyn_assert(ts1.vobs,4);
@@ -499,8 +499,8 @@ end
 %$     t(1) = 1;
 %$ catch
 %$     t(1) = 0;
-%$ end 
-%$ 
+%$ end
+%$
 %$ % Instantiate a time series object.
 %$ if t(1)
 %$    t(2) = dyn_assert(ts1.vobs,4);
@@ -845,7 +845,7 @@ end
 %$ T = all(t);
 %@eof:21
 
-%@test:21
+%@test:22
 %$ % Define a datasets.
 %$ A = rand(1,3);
 %$
@@ -867,4 +867,28 @@ end
 %$    t(4) = dyn_assert(ts.data,repmat(A,4,1),1e-15);
 %$ end
 %$ T = all(t);
-%@eof:21
+%@eof:22
\ No newline at end of file
+
+%@test:23
+%$ % Instantiate a dseries object.
+%$ ts0 = dseries(randn(10,6), '1999y');
+%$
+%$ % Try to remove Variable_2 and Variable_3
+%$ try
+%$     ts0{'Variable_@2,3@'} = [];
+%$     t(1) = 1;
+%$ catch
+%$     t(1) = 0;
+%$ end
+%$
+%$ if t(1)
+%$    % Try to display Variable_2 and Variable_3 again (should fail because already removed)
+%$    try
+%$       ts0{'Variable_@2,3@'};
+%$       t(2) = 0;
+%$    catch
+%$       t(2) = 1;
+%$    end
+%$ end
+%$ T = all(t);
+%@eof:23
\ No newline at end of file

matlab/@dseries/subsref.m

@@ -65,7 +65,7 @@ function B = subsref(A, S) % --*-- Unitary tests --*--
 switch S(1).type
   case '.'
     switch S(1).subs
-      case {'data','nobs','vobs','name','tex','freq','dates','init'}        % Public members.
+      case {'data','nobs','vobs','name','tex','dates'}        % Public members.
         if length(S)>1 && isequal(S(2).type,'()') && isempty(S(2).subs)
             error(['dseries::subsref: ' S(1).subs ' is not a method but a member!'])
         end
@@ -75,6 +75,15 @@ switch S(1).type
         if length(S)>1 && isequal(S(2).type,'()') && isempty(S(2).subs)
             S = shiftS(S,1);
         end
+      case 'init'
+        % Returns a dates object (first date).
+        B = A.dates(1);
+      case 'last'
+        % Returns a dates object (last date).
+        B = A.dates(end);
+      case 'freq'
+        % Returns an integer characterizing the data frequency (1, 4, 12 or 52)
+        B = A.dates.freq;
       case {'lag','lead','hptrend','hpcycle','chain'} % Methods with less than two arguments.
         if length(S)>1 && isequal(S(2).type,'()')
             if isempty(S(2).subs)
@@ -90,7 +99,7 @@ switch S(1).type
         else
             B = feval(S(1).subs,A);
         end
-      case {'cumsum','insert','pop','cumprod'} % Methods with less than three argument.
+      case {'cumsum','insert','pop','cumprod','remove'} % Methods with less than three argument.
         if length(S)>1 && isequal(S(2).type,'()')
             if isempty(S(2).subs)
                 B = feval(S(1).subs,A);
@@ -170,8 +179,6 @@ switch S(1).type
             B.tex  = deblank(A.tex(ndx,:));
             B.nobs = A.nobs;
             B.vobs = 1;
-            B.freq = A.freq;
-            B.init = A.init;
             B.dates = A.dates;
         else
             error('dseries::subsref: Unknown public method, public member or variable!')
@@ -227,29 +234,9 @@ switch S(1).type
         B.tex  = A.tex;
         B.nobs = length(tdx);
         B.vobs = A.vobs;
-        B.freq = A.freq;
-        B.init = A.init+(tdx(1)-1);
         B.dates = A.dates(tdx);
     elseif isvector(S(1).subs{1}) && all(isint(S(1).subs{1}))
-        % Extract a subsample using a vector of integers (observation index).
-        % Note that this does not work if S(1).subs is an integer scalar... In which case S(1).subs is interpreted as a lead/lag operator (as in the Dynare syntax).
-        % To extract one observation, a dates with one element input must be used.
-        if all(S(1).subs{1}>0) && all(S(1).subs{1}<=A.nobs)
-            if size(A.data,2)>1
-                S(1).subs = [S(1).subs, ':'];
-            end
-            B = dseries();
-            B.data = builtin('subsref', A.data, S(1));
-            B.nobs = size(B.data,1);
-            B.vobs = A.vobs;
-            B.freq = A.freq;
-            B.dates = A.dates(S(1).subs{1});
-            B.init = B.dates(1);
-            B.name = A.name;
-            B.tex  = A.tex;
-        else
-            error('dseries::subsref: Indices are out of bounds!')
-        end
+        error('dseries::subsref: It is not possible to select observations with a vector of integers. You have to index with a dates object instead!');
     else
         error('dseries::subsref: I have no idea of what you are trying to do!')
     end
@@ -267,8 +254,6 @@ switch S(1).type
         B.tex  = A.tex(idx);
         B.nobs = A.nobs;
         B.vobs = length(idx);
-        B.freq = A.freq;
-        B.init = A.init;
         B.dates = A.dates;
     else
         error('dseries::subsref: What the Hell are you tryin'' to do?!')
@@ -293,7 +278,7 @@ end
 %$ ts1 = dseries(A,[],A_name,[]);
 %$
 %$ % Call the tested method.
-%$ a = ts1(2:9);
+%$ a = ts1(ts1.dates(2:9));
 %$
 %$ % Expected results.
 %$ e.data = [transpose(2:9),2*transpose(2:9)];
@@ -653,7 +638,7 @@ end
 %@test:15
 %$ try
 %$     ds = dseries(transpose(1:5));
-%$     ts = ds(2:3);
+%$     ts = ds(ds.dates(2:3));
 %$     t(1) = 1;
 %$ catch
 %$     t(1) = 0;
@@ -670,7 +655,7 @@ end
 %@test:16
 %$ try
 %$     ds = dseries(transpose(1:5));
-%$     ts = ds(2:6);
+%$     ts = ds(ds.dates(2:6));
 %$     t(1) = 0;
 %$ catch
 %$     t(1) = 1;

matlab/@dseries/uminus.m

@@ -42,10 +42,8 @@ function A = uminus(B) % --*-- Unitary tests --*--
 
 A = dseries();
 
-A.freq = B.freq;
 A.nobs = B.nobs;
 A.vobs = B.vobs;
-A.init = B.init;
 A.dates = B.dates;
 A.name = cell(A.vobs,1);
 A.tex = cell(A.vobs,1);

matlab/@dseries/vertcat.m

@@ -60,7 +60,7 @@ end
 
 function d = vertcat_(b, c)
     d = NaN;
-    if ~isequal(b.freq, c.freq)
+    if ~isequal(frequency(b), frequency(c))
         error('dseries::vertcat: Frequencies must be common!')
     end
     if ~isequal(b.vobs, c.vobs)