Hello community,
here is the log from the commit of package octave-forge-ocs for
openSUSE:Factory checked in at 2015-07-12 22:52:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-ocs (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-ocs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-ocs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/octave-forge-ocs/octave-forge-ocs.changes
2015-06-16 15:12:57.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.octave-forge-ocs.new/octave-forge-ocs.changes
2015-07-12 22:53:01.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Jul 7 18:18:41 UTC 2015 - dmitr...@opensuse.org
+
+- Update to version 0.1.4
+ * Minor fixes
+
+-------------------------------------------------------------------
Old:
----
ocs-0.1.3.tar.gz
New:
----
ocs-0.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-ocs.spec ++++++
--- /var/tmp/diff_new_pack.1vMgSS/_old 2015-07-12 22:53:01.000000000 +0200
+++ /var/tmp/diff_new_pack.1vMgSS/_new 2015-07-12 22:53:01.000000000 +0200
@@ -18,7 +18,7 @@
%define octpkg ocs
Name: octave-forge-%{octpkg}
-Version: 0.1.3
+Version: 0.1.4
Release: 0
Summary: Octave Circuit Simulator for Octave
License: GPL-2.0+
++++++ ocs-0.1.3.tar.gz -> ocs-0.1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/DESCRIPTION new/ocs/DESCRIPTION
--- old/ocs/DESCRIPTION 2012-01-21 20:03:02.000000000 +0100
+++ new/ocs/DESCRIPTION 2015-07-07 07:03:42.000000000 +0200
@@ -1,11 +1,10 @@
Name: OCS
-Version: 0.1.3
-Date: 2011-08-08
+Version: 0.1.4
+Date: 2015-07-07
Author: Carlo de Falco, Culpo Massimiliano, Marco Merlin
-Maintainer: Culpo Massimiliano
+Maintainer: Carlo de Falco, Culpo Massimiliano
Title: Octave Circuit Simulator
Description: Package for solving DC and transient electrical circuit equations
Depends: octave (>= 3.0.0), odepkg
Autoload: no
-License: GPL version 2 or later
-SVNRelease: 9554
+License: GPLv2+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/NEWS new/ocs/NEWS
--- old/ocs/NEWS 1970-01-01 01:00:00.000000000 +0100
+++ new/ocs/NEWS 2015-07-07 07:03:42.000000000 +0200
@@ -0,0 +1,6 @@
+Summary of important user-visible changes for ocs 0.1.4:
+-------------------------------------------------------------------
+
+ ** Fixed a few incompatibilities with Octave 4.0 and warnings about
+ use of deprecated syntax.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/PKG_ADD new/ocs/PKG_ADD
--- old/ocs/PKG_ADD 2011-08-06 14:32:14.000000000 +0200
+++ new/ocs/PKG_ADD 2015-07-07 07:03:42.000000000 +0200
@@ -4,15 +4,15 @@
if (! exist (fullfile (dirname, "inst"), "dir"))
## Run this if the package is installed
for ii=1:length (dirlist)
- addpath ( [ dirname "/../" dirlist{ii}],"-end")
+ addpath (fullfile (dirname, "..", dirlist{ii}), "-end")
endfor
else
## Run this if we are testing the package without installation
for ii=1:length(dirlist)
- addpath ([ dirname "/inst/" dirlist{ii}])
- addpath ([ dirname "/src/"])
+ addpath (fullfile (dirname, "inst", dirlist{ii}))
+ addpath (fullfile (dirname, "src"))
endfor
endif
-warning('off', 'Octave:fopen-file-in-path');
+warning ("off", "Octave:fopen-file-in-path");
clear dirlist dirname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/PKG_DEL new/ocs/PKG_DEL
--- old/ocs/PKG_DEL 2011-08-06 14:32:14.000000000 +0200
+++ new/ocs/PKG_DEL 2012-09-16 09:31:08.000000000 +0200
@@ -1,15 +1,17 @@
dirlist = {"utl", "asm", "tst", "nls", "prs", "sbn"};
dirname = fileparts (canonicalize_file_name (mfilename ("fullpath")));
-for ii=1:length (dirlist)
- if (! exist (fullfile (dirname, "inst"), "dir"))
- ## Run this if the package is installed
- rmpath ( [ dirname "/../" dirlist{ii}])
- else
- ## Run this if we are testing the package without installation
- rmpath ([ dirname "/inst/" dirlist{ii}])
- rmpath ([ dirname "/src/"])
- end
-end
+if (! exist (fullfile (dirname, "inst"), "dir"))
+ ## Run this if the package is installed
+ for ii=1:length (dirlist)
+ rmpath (fullfile (dirname, "..", dirlist{ii}))
+ endfor
+else
+ ## Run this if we are testing the package without installation
+ for ii=1:length (dirlist)
+ rmpath (fullfile (dirname, "inst", dirlist{ii}))
+ endfor
+ rmpath (fullfile (dirname, "src"))
+endif
clear dirlist dirname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/asm/asm_build_system.m
new/ocs/inst/asm/asm_build_system.m
--- old/ocs/inst/asm/asm_build_system.m 2010-02-09 08:43:42.000000000 +0100
+++ new/ocs/inst/asm/asm_build_system.m 2013-08-28 22:24:54.000000000 +0200
@@ -64,7 +64,7 @@
## Evaluate element
if instruct.NLC(ibl).nintvar(iel)
- intvars = instruct.totextvar+instruct.NLC(ibl).osintvar(iel) + \
+ intvars = instruct.totextvar+instruct.NLC(ibl).osintvar(iel) + ...
[1:instruct.NLC(ibl).nintvar(iel)]';
else
intvars=[];
@@ -78,10 +78,10 @@
z = x(intvars);
- [a,b,c] = feval(instruct.NLC(ibl).func,\
- instruct.NLC(ibl).section,\
- instruct.NLC(ibl).pvmatrix(iel,:),\
- instruct.NLC(ibl).parnames,\
+ [a,b,c] = feval(instruct.NLC(ibl).func,...
+ instruct.NLC(ibl).section,...
+ instruct.NLC(ibl).pvmatrix(iel,:),...
+ instruct.NLC(ibl).parnames,...
y,z,t);
## Assemble matrices
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/nls/nls_newton_raphson.m
new/ocs/inst/nls/nls_newton_raphson.m
--- old/ocs/inst/nls/nls_newton_raphson.m 2010-02-09 08:43:42.000000000
+0100
+++ new/ocs/inst/nls/nls_newton_raphson.m 2013-08-28 22:24:54.000000000
+0200
@@ -47,7 +47,7 @@
##
@seealso{nls_stationary,tst_backward_euler,tst_theta_method,tst_daspk,tst_odepkg}
## @end deftypefn
-function [y,ii,resnrm] = nls_newton_raphson(y0,RES,JAC,tol,maxit,\
+function [y,ii,resnrm] = nls_newton_raphson(y0,RES,JAC,tol,maxit,...
verbosity,update);
## Check input
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/prs/prs_iff.m new/ocs/inst/prs/prs_iff.m
--- old/ocs/inst/prs/prs_iff.m 2012-01-21 19:56:13.000000000 +0100
+++ new/ocs/inst/prs/prs_iff.m 2013-08-28 22:24:54.000000000 +0200
@@ -76,8 +76,8 @@
## Initialization
version ="0.1b1";
- outstruct = struct("NLC",[],\
- "LCR",[],\
+ outstruct = struct("NLC",[],...
+ "LCR",[],...
"totextvar",0);
## Open cir file
@@ -120,7 +120,7 @@
## parse NLC block
[outstruct,intvar] = parseNLCblock(fid,line,outstruct,NLCcount,intvar);
- ndsvec = [ndsvec ; \
+ ndsvec = [ndsvec ; ...
outstruct.NLC(NLCcount).vnmatrix(:)];
## skip the newline char after the matrix
@@ -151,7 +151,7 @@
## parse block header
[outstruct,intvar] = parseLCRblock(fid,line,outstruct,LCRcount,intvar);
- ndsvec = [ndsvec ; \
+ ndsvec = [ndsvec ; ...
outstruct.LCR(LCRcount).vnmatrix(:)];
## skip the newline char after the matrix
@@ -250,7 +250,7 @@
## Compute internal variables cycling over each
## element in the section
for iel = 1:nrows
- [a,b,c] = feval(func,section,outstruct.NLC(NLCcount).pvmatrix(iel,:),\
+ [a,b,c] = feval(func,section,outstruct.NLC(NLCcount).pvmatrix(iel,:),...
outstruct.NLC(NLCcount).parnames,zeros(nextvar,1),[],0);
## FIXME: if all the element in the same section share the
@@ -297,7 +297,7 @@
## Compute internal variables cycling over each
## element in the section
for iel = 1:nrows
- [a,b,c] = feval(func,section,outstruct.LCR(LCRcount).pvmatrix(iel,:),\
+ [a,b,c] = feval(func,section,outstruct.LCR(LCRcount).pvmatrix(iel,:),...
outstruct.LCR(LCRcount).parnames,zeros(nextvar,1),[],0);
## FIXME: if all the element in the same section share the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/sbn/Mcurrentsources.m
new/ocs/inst/sbn/Mcurrentsources.m
--- old/ocs/inst/sbn/Mcurrentsources.m 2010-02-09 08:43:42.000000000 +0100
+++ new/ocs/inst/sbn/Mcurrentsources.m 2013-08-28 22:24:54.000000000 +0200
@@ -81,9 +81,9 @@
endfor
a = zeros(4);
- b = [0 0 K -K;\
- 0 0 -K K;\
- 0 0 0 0;\
+ b = [0 0 K -K;...
+ 0 0 -K K;...
+ 0 0 0 0;...
0 0 0 0];
c = zeros(4,1);
## NLC part
@@ -110,9 +110,9 @@
dIdv = 2*K*dv;
a = zeros(4);
- b = [0 0 dIdv -dIdv;\
- 0 0 -dIdv dIdv;\
- 0 0 0 0;\
+ b = [0 0 dIdv -dIdv;...
+ 0 0 -dIdv dIdv;...
+ 0 0 0 0;...
0 0 0 0];
c = [I -I 0 0];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/sbn/Mresistors.m
new/ocs/inst/sbn/Mresistors.m
--- old/ocs/inst/sbn/Mresistors.m 2010-02-09 08:43:42.000000000 +0100
+++ new/ocs/inst/sbn/Mresistors.m 2015-07-07 07:03:42.000000000 +0200
@@ -58,7 +58,8 @@
## @end deftypefn
-function [a,b,c] =Mresistors(string,parameters,parameternames,extvar,intvar,t)
+function [a,b,c] = Mresistors (string, parameters, parameternames,
+ extvar, intvar, t)
switch string
## LCR part
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/sbn/Mshichmanhodgesmosfet.m
new/ocs/inst/sbn/Mshichmanhodgesmosfet.m
--- old/ocs/inst/sbn/Mshichmanhodgesmosfet.m 2011-08-06 14:32:14.000000000
+0200
+++ new/ocs/inst/sbn/Mshichmanhodgesmosfet.m 2013-08-28 22:24:54.000000000
+0200
@@ -84,7 +84,7 @@
num2str(parameters(ii)) " ;"])
endfor
- [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = \
+ [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = ...
nmos(extvar,mu0,Cox,W,L,Vth,rd,Tshift);
vg = extvar(1);
@@ -104,26 +104,26 @@
Qdb = intvar(5);
a11 = a21 = a22 = zeros(5,5);
- a12 = [ 1 1 1 0 0; \
- 0 -1 0 1 0; \
- 0 0 -1 0 1; \
- -1 0 0 -1 -1; \
+ a12 = [ 1 1 1 0 0; ...
+ 0 -1 0 1 0; ...
+ 0 0 -1 0 1; ...
+ -1 0 0 -1 -1; ...
0 0 0 0 0];
a = [a11 a12; a21 a22];
- b11 = [0 0 0 0 0; \
- -gm (gm+gd) -gd 0 -didT; \
- gm -(gm+gd) gd 0 didT; \
- 0 0 0 0 0; \
+ b11 = [0 0 0 0 0; ...
+ -gm (gm+gd) -gd 0 -didT; ...
+ gm -(gm+gd) gd 0 didT; ...
+ 0 0 0 0 0; ...
dPdvgs -(dPdvgs+dPdvds) dPdvds 0 dPdT];
b12 = zeros(5,5);
- b21 = [Cgb 0 0 -Cgb 0; \
- Cgs -Cgs 0 0 0; \
- Cgd 0 -Cgd 0 0; \
- 0 Csb 0 -Csb 0; \
+ b21 = [Cgb 0 0 -Cgb 0; ...
+ Cgs -Cgs 0 0 0; ...
+ Cgd 0 -Cgd 0 0; ...
+ 0 Csb 0 -Csb 0; ...
0 0 Cdb -Cdb 0];
b22 = -eye(5);
@@ -132,10 +132,10 @@
c1 = [0; -ids; ids; 0; P];
- c2 = [Cgb*(vg - vb) - Qgb;\
- Cgs*(vg - vs) - Qgs;\
- Cgd*(vg - vd) - Qgd;\
- Csb*(vs - vb) - Qsb;\
+ c2 = [Cgb*(vg - vb) - Qgb;...
+ Cgs*(vg - vs) - Qgs;...
+ Cgd*(vg - vd) - Qgd;...
+ Csb*(vs - vb) - Qsb;...
Cdb*(vd - vb) - Qdb];
c = [c1;c2];
@@ -160,7 +160,7 @@
num2str(parameters(ii)) " ;"])
endfor
- [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = \
+ [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = ...
pmos(extvar,mu0,Cox,W,L,Vth,rd,Tshift);
@@ -181,26 +181,26 @@
Qdb = intvar(5);
a11 = a21 = a22 = zeros(5,5);
- a12 = [ 1 1 1 0 0; \
- 0 -1 0 1 0; \
- 0 0 -1 0 1; \
- -1 0 0 -1 -1; \
+ a12 = [ 1 1 1 0 0; ...
+ 0 -1 0 1 0; ...
+ 0 0 -1 0 1; ...
+ -1 0 0 -1 -1; ...
0 0 0 0 0];
a = [a11 a12; a21 a22];
- b11 = [0 0 0 0 0; \
- -gm (gm+gd) -gd 0 -didT; \
- gm -(gm+gd) gd 0 didT; \
- 0 0 0 0 0; \
+ b11 = [0 0 0 0 0; ...
+ -gm (gm+gd) -gd 0 -didT; ...
+ gm -(gm+gd) gd 0 didT; ...
+ 0 0 0 0 0; ...
dPdvgs -(dPdvgs+dPdvds) dPdvds 0 dPdT];
b12 = zeros(5,5);
- b21 = [Cgb 0 0 -Cgb 0; \
- Cgs -Cgs 0 0 0; \
- Cgd 0 -Cgd 0 0; \
- 0 Csb 0 -Csb 0; \
+ b21 = [Cgb 0 0 -Cgb 0; ...
+ Cgs -Cgs 0 0 0; ...
+ Cgd 0 -Cgd 0 0; ...
+ 0 Csb 0 -Csb 0; ...
0 0 Cdb -Cdb 0];
b22 = -eye(5);
@@ -210,10 +210,10 @@
c1 = [0; -ids; ids; 0; P];
- c2 = [Cgb*(vg - vb) - Qgb;\
- Cgs*(vg - vs) - Qgs;\
- Cgd*(vg - vd) - Qgd;\
- Csb*(vs - vb) - Qsb;\
+ c2 = [Cgb*(vg - vb) - Qgb;...
+ Cgs*(vg - vs) - Qgs;...
+ Cgd*(vg - vd) - Qgd;...
+ Csb*(vs - vb) - Qsb;...
Cdb*(vd - vb) - Qdb];
c = [c1;c2];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/tst/tst_odepkg.m
new/ocs/inst/tst/tst_odepkg.m
--- old/ocs/inst/tst/tst_odepkg.m 2010-02-09 08:43:42.000000000 +0100
+++ new/ocs/inst/tst/tst_odepkg.m 2013-08-28 22:24:54.000000000 +0200
@@ -61,7 +61,7 @@
##
## @end deftypefn
-function [out, tout] = tst_odepkg (outstruct,x,t,tol,maxit,\
+function [out, tout] = tst_odepkg (outstruct,x,t,tol,maxit,...
pltvars,solver,verbosity,odestruct)
## Check input
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/inst/tst/tst_theta_method.m
new/ocs/inst/tst/tst_theta_method.m
--- old/ocs/inst/tst/tst_theta_method.m 2010-02-09 08:43:42.000000000 +0100
+++ new/ocs/inst/tst/tst_theta_method.m 2013-08-28 22:24:54.000000000 +0200
@@ -56,7 +56,7 @@
##
## @end deftypefn
-function [out, varargout] = tst_theta_method(outstruct,x,t,tol,maxit,\
+function [out, varargout] = tst_theta_method(outstruct,x,t,tol,maxit,...
theta,pltvars,verbosity)
## Check input
@@ -108,8 +108,8 @@
resold, theta, A1, Jac, res);
UPDT = @(x) TSTTHETAFUNUP1 (outstruct, x, t(it));
- [out(:,it),ii,resnrm] = nls_newton_raphson(out(:,it-1),RES,JAC,\
- tol, maxit,verbosity(1),\
+ [out(:,it),ii,resnrm] = nls_newton_raphson(out(:,it-1),RES,JAC,...
+ tol, maxit,verbosity(1),...
UPDT);
if nargout > 1
@@ -159,4 +159,4 @@
[A1,Jac,res] = asm_build_system(outstruct,x,t1);
update = {A1,Jac,res};
-endfunction
\ No newline at end of file
+endfunction
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ocs/src/Mshichmanhodgesmosfet.cc
new/ocs/src/Mshichmanhodgesmosfet.cc
--- old/ocs/src/Mshichmanhodgesmosfet.cc 2010-02-09 08:53:59.000000000
+0100
+++ new/ocs/src/Mshichmanhodgesmosfet.cc 2015-07-07 07:03:42.000000000
+0200
@@ -75,7 +75,7 @@
double* Cox, double* Cgs, double* Cgd, double* Cgb, double*
Csb,
double* Cdb, double* Tshift)
{
- octave_idx_type nnames = parameternames.length();
+ octave_idx_type nnames = parameternames.numel ();
octave_idx_type niter = 0;
//FIXME: it should be better to use Octave_map<string,value> for parameters
while (niter < nnames)
@@ -222,7 +222,7 @@
DEFUN_DLD(Mshichmanhodgesmosfet,args,nargout,
"-*- texinfo -*-\n\
\n\
-@deftypefn{Function File} @\n\
+@deftypefn{Loadable Function} @\n\
{[@var{a},@var{b},@var{c}]=} Mshichmanhodgesmosfet@\n\
(@var{string}, @var{parameters}, @var{parameternames}, @\n\
@var{extvar},@var{intvar},@var{t})\n\
