--- a/main/queueing/Makefile	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/Makefile	Thu Nov 01 22:28:59 2012 +0000
@@ -5,7 +5,7 @@
 DISTNAME=$(PROGNAME)-$(VERSIONNUM)
 SUBDIRS=inst doc test devel
 DISTFILES=COPYING NEWS DESCRIPTION
-DISTSUBDIRS=inst doc
+DISTSUBDIRS=inst inst/private doc
 
 .PHONY: clean check
 

--- a/main/queueing/doc/qn_closed_multi_cs.fig	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/doc/qn_closed_multi_cs.fig	Thu Nov 01 22:28:59 2012 +0000
@@ -66,3 +66,6 @@
 4 0 0 50 -1 0 10 0.0000 4 105 315 4590 4905 CPU\001
 4 0 0 50 -1 0 10 0.0000 4 105 210 6480 5355 I/O\001
 4 0 0 50 -1 0 10 0.0000 4 105 210 6480 4455 I/O\001
+4 0 0 50 -1 0 10 0.0000 4 105 165 4680 5490 PS\001
+4 0 0 50 -1 0 10 0.0000 4 105 360 6390 4995 FCFS\001
+4 0 0 50 -1 0 10 0.0000 4 105 360 6390 5895 FCFS\001

--- a/main/queueing/inst/Makefile	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/inst/Makefile	Thu Nov 01 22:28:59 2012 +0000
@@ -1,5 +1,5 @@
 .PHONY: clean check dist
-DISTFILES=$(wildcard *.m) $(wildcard private/*.m) Makefile
+DISTFILES=$(wildcard *.m)
 
 ALL:
 

--- a/main/queueing/inst/dtmc_mtta.m	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/inst/dtmc_mtta.m	Thu Nov 01 22:28:59 2012 +0000
@@ -33,7 +33,7 @@
   persistent warned = false;
   if (!warned)
     warned = true;
-    warning("qn:deprecated-function",
+    warning("qn:deprecated-function", 
 	    "dtmc_mtta is deprecated. Please use dtmcmtta instead");
   endif
   [t N B] = dtmcmtta( varargin{:} );
@@ -43,7 +43,7 @@
 %! fail( "dtmc_mtta()" );
 
 %!test
-%! P = dtmc_bd([0 .5 .5 .5], [.5 .5 .5 0]);
+%! P = dtmcbd([0 .5 .5 .5], [.5 .5 .5 0]);
 %! [t N B] = dtmc_mtta(P);
 %! assert( t, [0 3 4 3 0], 10*eps );
 %! assert( B([2 3 4],[1 5]), [3/4 1/4; 1/2 1/2; 1/4 3/4], 10*eps );
@@ -51,7 +51,7 @@
 %! assert( B(5,5), 1 );
 
 %!test
-%! P = dtmc_bd([0 .5 .5 .5], [.5 .5 .5 0]);
+%! P = dtmcbd([0 .5 .5 .5], [.5 .5 .5 0]);
 %! [t N B] = dtmc_mtta(P);
 %! assert( t(3), 4, 10*eps );
 %! assert( B(3,1), 0.5, 10*eps );
@@ -59,7 +59,7 @@
 
 ## Example on p. 422 of [GrSn97]
 %!test
-%! P = dtmc_bd([0 .5 .5 .5 .5], [.5 .5 .5 .5 0]);
+%! P = dtmcbd([0 .5 .5 .5 .5], [.5 .5 .5 .5 0]);
 %! [t N B] = dtmc_mtta(P);
 %! assert( t(2:5), [4 6 6 4], 100*eps );
 %! assert( B(2:5,1), [.8 .6 .4 .2]', 100*eps );

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main/queueing/inst/private/Makefile	Thu Nov 01 22:28:59 2012 +0000
@@ -0,0 +1,12 @@
+.PHONY: clean check dist
+DISTFILES=$(wildcard *.m)
+
+ALL:
+
+clean:
+	\rm -f *~
+
+distclean: clean
+
+dist:
+	ln $(DISTFILES) ../../`cat ../../fname`/inst/private/

--- a/main/queueing/inst/qncmmva.m	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/inst/qncmmva.m	Thu Nov 01 22:28:59 2012 +0000
@@ -596,7 +596,7 @@
 %! V(2,:) = linspace(6,3,K);
 %! N = [10 0]; # class 2 has no customers
 %! [U1 R1 Q1 X1] = qncmmva(N,S,V);
-%! [U2 R2 Q2 X2] = qnclosedsinglemva(N(1),S(1,:),V(1,:));
+%! [U2 R2 Q2 X2] = qncsmva(N(1),S(1,:),V(1,:));
 %! assert( U1(1,:), U2, 1e-5 );
 %! assert( R1(1,:), R2, 1e-5 );
 %! assert( Q1(1,:), Q2, 1e-5 );

--- a/main/queueing/inst/qncsconv.m	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/inst/qncsconv.m	Thu Nov 01 22:28:59 2012 +0000
@@ -183,7 +183,7 @@
 %! S = [ 0.02 0.2 0.4 0.6 ];
 %! K = 6;
 %! V = [ 1 0.4 0.2 0.1 ];
-%! [U_mva R_mva Q_mva X_mva G_mva] = qnclosedsinglemva(K, S, V);
+%! [U_mva R_mva Q_mva X_mva G_mva] = qncsmva(K, S, V);
 %! [U_con R_con Q_con X_con G_con] = qncsconv(K, S, V);
 %! assert( U_mva, U_con, 1e-5 );
 %! assert( R_mva, R_con, 1e-5 );
@@ -197,7 +197,7 @@
 %! K = 6;
 %! V = [ 1 0.4 0.2 0.1 ];
 %! m = [ 1 -1 2 1 ]; # center 2 is IS
-%! [U_mva R_mva Q_mva X_mva] = qnclosedsinglemva(K, S, V, m);
+%! [U_mva R_mva Q_mva X_mva] = qncsmva(K, S, V, m);
 %! [U_con R_con Q_con X_con G] = qncsconv(K, S, V, m );
 %! assert( U_mva, U_con, 1e-5 );
 %! assert( R_mva, R_con, 1e-5 );

--- a/main/queueing/inst/qsmmmk.m	Thu Nov 01 21:14:20 2012 +0000
+++ b/main/queueing/inst/qsmmmk.m	Thu Nov 01 22:28:59 2012 +0000
@@ -140,7 +140,7 @@
     ## Build and solve the birth-death process describing the M/M/m/k system
     birth_rate = lambda(i)*ones(1,K(i));
     death_rate = [ linspace(1,m(i),m(i))*mu(i) ones(1,K(i)-m(i))*m(i)*mu(i) ];
-    p = ctmc(ctmc_bd(birth_rate, death_rate));
+    p = ctmc(ctmcbd(birth_rate, death_rate));
     p0(i) = p(1);
     pK(i) = p(1+K(i));
     j = [1:K(i)];
@@ -186,7 +186,7 @@
 %! [U1 R1 Q1 X1 p0] = qsmmmk( lambda, mu, m, k );
 %! birth = lambda*ones(1,k);
 %! death = [ mu*linspace(1,m,m) mu*m*ones(1,k-m) ];
-%! q = ctmc(ctmc_bd( birth, death ));
+%! q = ctmc(ctmcbd( birth, death ));
 %! U2 = dot( q, min( 0:k, m )/m );
 %! assert( U1, U2, 1e-4 );
 %! Q2 = dot( [0:k], q );