Overview
Comment:Updated to conform to latest Octave (tested with 2.1.49).
- the pathsearch library was merged into liboctave last year
- static_cast no longer seems to work between Matrix and ColumnVector
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: 77f1fcb5c9a668088789469a9b25fa76492cde67142b1b71b96c99fd8ff0063c
User & Date: geraint@users.sourceforge.net on 2003-07-13 21:53:24
Other Links: branch diff | manifest | tags
Context
2003-07-13
21:55:31
.deb-installed mtt no longer prints base path every couple of lines check-in: dbbbdb47df user: geraint@users.sourceforge.net tags: origin/master, trunk
21:53:24
Updated to conform to latest Octave (tested with 2.1.49).
- the pathsearch library was merged into liboctave last year
- static_cast no longer seems to work between Matrix and ColumnVector check-in: 77f1fcb5c9 user: geraint@users.sourceforge.net tags: origin/master, trunk
2003-06-26
15:36:09
Tidied check-in: 4423576ece user: gawthrop@users.sourceforge.net tags: origin/master, trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified mttroot/mtt/bin/mttrc from [8caf461eeb] to [8b8d444c96].

︙
11
12
13
14
15
16
17



18
19
20
21
22
23
24

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27








+
+
+










###############################################################
## Version control history
###############################################################
## $Id$
## $Log$
## Revision 1.37  2002/09/19 08:08:15  gawthrop
## Updated documentation documentation
##
## Revision 1.36  2002/08/28 15:48:00  geraint
## Updated mttrc to make standalone C++ compilation configuration clearer.
##
## Revision 1.35  2002/08/06 09:56:54  geraint
## Updated to work with changes in unstable version of Octave 2.1.36.
## Tested with 2.0.17 (ok) but will break earlier unstables (2.1.(<=35)).
##
︙
232
233
234
235
236
237
238
239
240
241

242
243
244
245
246
247
248
249
250
251

235
236
237
238
239
240
241



242



243
244
245
246
247
248
249








-
-
-
+
-
-
-








    # include paths for Octave

    IOCTAVE="-I${OCTAVEPREFIX}/include/octave/ -I${OCTAVEPREFIX}/include/octave/octave"

    # library paths for Octave

    OCTAVEVERS=`octave --version | head -1 | gawk '{ print $4 }'`
    OCTAVEMINOR=`echo ${OCTAVEVERS} | gawk -F\. '{print $2}'`
    if [ "${OCTAVEMINOR}" = "0" ] ; then # stable
	LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS}"
    LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS}"
    else
	LOCTAVE="-L${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loctave -lcruft -loctinterp -Wl,--rpath,${OCTAVEPREFIX}/lib/octave-${OCTAVEVERS} -loct-pathsearch -loct-readline"
    fi
    LSYSTEM="-ldl -lm -lncurses -lkpathsea -lreadline -lblas -llapack -lfftw -lg2c"
    
    # C++ compiler options

    DEBUG="-g"
    OPTIM="-O3"
    FLAGS="-fno-rtti -fno-exceptions -fno-implicit-templates"
︙

Modified mttroot/mtt/lib/cc/mtt_implicit.cc from [44405c14b7] to [c10762dcf4].

︙
49
50
51
52
53
54
55
56

57
58
59
60
61
62
63

49
50
51
52
53
54
55

56
57
58
59
60
61
62
63








-
+








	      AA (row,col) = 0.0;
	      AA (col,row) = 0.0;
	    }
	}
    }

#ifdef OCTAVE_DEV
  x = static_cast<ColumnVector> (xleftdiv (AA, static_cast<Matrix>(AAx + dx * t)));
  x = xleftdiv (AA, Matrix(AAx + dx * t)).column (0);
#else // !OCTAVE_DEV
  Matrix tmp = xleftdiv (AA, static_cast<Matrix>(static_cast<ColumnVector>(AAx + dx * t)));
  for (row = 0; row < Nx; row++)
    {
      x (row) = tmp (row,0);
    }
#endif // OCTAVE_DEV
︙

MTT: Model Transformation Tools
[ GitHub | SourceHut | Sourceforge | Fossil RSS ]