DELETED CVSROOT/checkoutlist
Index: CVSROOT/checkoutlist
==================================================================
--- CVSROOT/checkoutlist
+++ /dev/null
@@ -1,14 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename><whitespace><error message><end-of-line>
-#
-# comment lines begin with '#'
-syncmail

DELETED CVSROOT/commitinfo
Index: CVSROOT/commitinfo
==================================================================
--- CVSROOT/commitinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED CVSROOT/config
Index: CVSROOT/config
==================================================================
--- CVSROOT/config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Set `PreservePermissions' to `yes' to save file status information
-# in the repository.
-#PreservePermissions=no
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no

DELETED CVSROOT/cvswrappers
Index: CVSROOT/cvswrappers
==================================================================
--- CVSROOT/cvswrappers
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -t/-f options allow one to treat directories of files
-# as a single file, or to transform a file in other ways on
-# its way in and out of CVS.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'

DELETED CVSROOT/editinfo
Index: CVSROOT/editinfo
==================================================================
--- CVSROOT/editinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

DELETED CVSROOT/loginfo
Index: CVSROOT/loginfo
==================================================================
--- CVSROOT/loginfo
+++ /dev/null
@@ -1,30 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
-
-# Lines to mail changes
-CVSROOT $CVSROOT/CVSROOT/syncmail %{sVv} gawthrop@users.sourceforge.net
-DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} mtt-checkins@lists.sourceforge.net

DELETED CVSROOT/modules
Index: CVSROOT/modules
==================================================================
--- CVSROOT/modules
+++ /dev/null
@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.

DELETED CVSROOT/notify
Index: CVSROOT/notify
==================================================================
--- CVSROOT/notify
+++ /dev/null
@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail %s -s "CVS notification"

DELETED CVSROOT/rcsinfo
Index: CVSROOT/rcsinfo
==================================================================
--- CVSROOT/rcsinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED CVSROOT/syncmail
Index: CVSROOT/syncmail
==================================================================
--- CVSROOT/syncmail
+++ /dev/null
@@ -1,323 +0,0 @@
-#! /usr/bin/python
-
-# NOTE: Until SourceForge installs a modern version of Python on the cvs
-# servers, this script MUST be compatible with Python 1.5.2.
-
-"""Complicated notification for CVS checkins.
-
-This script is used to provide email notifications of changes to the CVS
-repository.  These email changes will include context diffs of the changes.
-Really big diffs will be trimmed.
-
-This script is run from a CVS loginfo file (see $CVSROOT/CVSROOT/loginfo).  To
-set this up, create a loginfo entry that looks something like this:
-
-    mymodule /path/to/this/script %%s some-email-addr@your.domain
-
-In this example, whenever a checkin that matches `mymodule' is made, this
-script is invoked, which will generate the diff containing email, and send it
-to some-email-addr@your.domain.
-
-    Note: This module used to also do repository synchronizations via
-    rsync-over-ssh, but since the repository has been moved to SourceForge,
-    this is no longer necessary.  The syncing functionality has been ripped
-    out in the 3.0, which simplifies it considerably.  Access the 2.x versions
-    to refer to this functionality.  Because of this, the script is misnamed.
-
-It no longer makes sense to run this script from the command line.  Doing so
-will only print out this usage information.
-
-Usage:
-
-    %(PROGRAM)s [options] <%%S> email-addr [email-addr ...]
-
-Where options are:
-
-    --cvsroot=<path>
-    	Use <path> as the environment variable CVSROOT.  Otherwise this
-    	variable must exist in the environment.
-
-    --context=#
-    -C #
-        Include # lines of context around lines that differ (default: 2).
-
-    -c
-        Produce a context diff (default).
-
-    -u
-        Produce a unified diff (smaller).
-
-    --quiet / -q
-        Don't print as much status to stdout.
-
-    --fromhost=hostname
-    -f hostname
-        The hostname that email messages appear to be coming from.  The From:
-        header will of the outgoing message will look like user@hostname.  By
-        default, hostname is the machine's fully qualified domain name.
-
-    --help / -h
-        Print this text.
-
-The rest of the command line arguments are:
-
-    <%%S>
-        CVS %%s loginfo expansion.  When invoked by CVS, this will be a single
-        string containing the directory the checkin is being made in, relative
-        to $CVSROOT, followed by the list of files that are changing.  If the
-        %%s in the loginfo file is %%{sVv}, context diffs for each of the
-        modified files are included in any email messages that are generated.
-
-    email-addrs
-        At least one email address.
-"""
-import os
-import sys
-import re
-import time
-import string
-import getopt
-import smtplib
-import pwd
-import socket
-
-try:
-    from socket import getfqdn
-except ImportError:
-    def getfqdn():
-        # Python 1.5.2 :(
-        hostname = socket.gethostname()
-        byaddr = socket.gethostbyaddr(socket.gethostbyname(hostname))
-        aliases = byaddr[1]
-        aliases.insert(0, byaddr[0])
-        aliases.insert(0, hostname)
-        for fqdn in aliases:
-            if '.' in fqdn:
-                break
-        else:
-            fqdn = 'localhost.localdomain'
-        return fqdn
-    
-
-from cStringIO import StringIO
-
-# Which SMTP server to do we connect to?  Empty string means localhost.
-MAILHOST = ''
-MAILPORT = 25
-
-# Diff trimming stuff
-DIFF_HEAD_LINES = 20
-DIFF_TAIL_LINES = 20
-DIFF_TRUNCATE_IF_LARGER = 1000
-
-EMPTYSTRING = ''
-SPACE = ' '
-DOT = '.'
-COMMASPACE = ', '
-
-PROGRAM = sys.argv[0]
-
-BINARY_EXPLANATION_LINES = [
-    "(This appears to be a binary file; contents omitted.)\n"
-    ]
-
-REVCRE = re.compile("^(NONE|[0-9.]+)$")
-NOVERSION = "Couldn't generate diff; no version number found in filespec: %s"
-BACKSLASH = "Couldn't generate diff: backslash in filespec's filename: %s"
-
-
-
-def usage(code, msg=''):
-    print __doc__ % globals()
-    if msg:
-        print msg
-    sys.exit(code)
-
-
-
-def calculate_diff(filespec, contextlines):
-    file, oldrev, newrev = string.split(filespec, ',')
-    # Make sure we can find a CVS version number
-    if not REVCRE.match(oldrev):
-        return NOVERSION % filespec
-    if not REVCRE.match(newrev):
-        return NOVERSION % filespec
-
-    if string.find(file, '\\') <> -1:
-        # I'm sorry, a file name that contains a backslash is just too much.
-        # XXX if someone wants to figure out how to escape the backslashes in
-        # a safe way to allow filenames containing backslashes, this is the
-        # place to do it.  --Zooko 2002-03-17
-        return BACKSLASH % filespec
-
-    if string.find(file, "'") <> -1:
-        # Those crazy users put single-quotes in their file names!  Now we
-        # have to escape everything that is meaningful inside double-quotes.
-        filestr = string.replace(file, '`', '\`')
-        filestr = string.replace(filestr, '"', '\"')
-        filestr = string.replace(filestr, '$', '\$')
-        # and quote it with double-quotes.
-        filestr = '"' + filestr + '"'
-    else:
-        # quote it with single-quotes.
-        filestr = "'" + file + "'"
-    if oldrev == 'NONE':
-        try:
-            if os.path.exists(file):
-                fp = open(file)
-            else:
-                update_cmd = "cvs -fn update -r %s -p %s" % (newrev, filestr)
-                fp = os.popen(update_cmd)
-            lines = fp.readlines()
-            fp.close()
-            # Is this a binary file?  Let's look at the first few
-            # lines to figure it out:
-            for line in lines[:5]:
-                for c in string.rstrip(line):
-                    if c in string.whitespace:
-                        continue
-                    if c < ' ' or c > chr(127):
-                        lines = BINARY_EXPLANATION_LINES[:]
-                        break
-            lines.insert(0, '--- NEW FILE: %s ---\n' % file)
-        except IOError, e:
-            lines = ['***** Error reading new file: ',
-                     str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()]
-    elif newrev == 'NONE':
-        lines = ['--- %s DELETED ---\n' % file]
-    else:
-        # This /has/ to happen in the background, otherwise we'll run into CVS
-        # lock contention.  What a crock.
-        if contextlines > 0:
-            difftype = "-C " + str(contextlines)
-        else:
-            difftype = "-u"
-        diffcmd = "/usr/bin/cvs -f diff -kk %s --minimal -r %s -r %s %s" \
-                  % (difftype, oldrev, newrev, filestr)
-        fp = os.popen(diffcmd)
-        lines = fp.readlines()
-        sts = fp.close()
-        # ignore the error code, it always seems to be 1 :(
-##        if sts:
-##            return 'Error code %d occurred during diff\n' % (sts >> 8)
-    if len(lines) > DIFF_TRUNCATE_IF_LARGER:
-        removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES
-        del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES]
-        lines.insert(DIFF_HEAD_LINES,
-                     '[...%d lines suppressed...]\n' % removedlines)
-    return string.join(lines, '')
-
-
-
-def blast_mail(subject, people, filestodiff, contextlines, fromhost):
-    # cannot wait for child process or that will cause parent to retain cvs
-    # lock for too long.  Urg!
-    if not os.fork():
-        # in the child
-        # give up the lock you cvs thang!
-        time.sleep(2)
-        # Create the smtp connection to the localhost
-        conn = smtplib.SMTP()
-        conn.connect(MAILHOST, MAILPORT)
-        user = pwd.getpwuid(os.getuid())[0]
-        domain = fromhost or getfqdn()
-        author = '%s@%s' % (user, domain)
-        s = StringIO()
-        sys.stdout = s
-        try:
-            print '''\
-From: %(author)s
-To: %(people)s
-Subject: %(subject)s
-''' % {'author' : author,
-       'people' : string.join(people, COMMASPACE),
-       'subject': subject,
-       }
-            s.write(sys.stdin.read())
-            # append the diffs if available
-            print
-            for file in filestodiff:
-                print calculate_diff(file, contextlines)
-        finally:
-            sys.stdout = sys.__stdout__
-        resp = conn.sendmail(author, people, s.getvalue())
-        conn.close()
-        os._exit(0)
-
-
-
-# scan args for options
-def main():
-    try:
-        opts, args = getopt.getopt(
-            sys.argv[1:], 'hC:cuqf:',
-            ['fromhost=', 'context=', 'cvsroot=', 'help', 'quiet'])
-    except getopt.error, msg:
-        usage(1, msg)
-
-    # parse the options
-    contextlines = 2
-    verbose = 1
-    fromhost = None
-    for opt, arg in opts:
-        if opt in ('-h', '--help'):
-            usage(0)
-        elif opt == '--cvsroot':
-            os.environ['CVSROOT'] = arg
-        elif opt in ('-C', '--context'):
-            contextlines = int(arg)
-        elif opt == '-c':
-            if contextlines <= 0:
-                contextlines = 2
-        elif opt == '-u':
-            contextlines = 0
-        elif opt in ('-q', '--quiet'):
-            verbose = 0
-        elif opt in ('-f', '--fromhost'):
-            fromhost = arg
-
-    # What follows is the specification containing the files that were
-    # modified.  The argument actually must be split, with the first component
-    # containing the directory the checkin is being made in, relative to
-    # $CVSROOT, followed by the list of files that are changing.
-    if not args:
-        usage(1, 'No CVS module specified')
-    subject = args[0]
-    specs = string.split(args[0])
-    del args[0]
-
-    # The remaining args should be the email addresses
-    if not args:
-        usage(1, 'No recipients specified')
-
-    # Now do the mail command
-    people = args
-
-    if verbose:
-        print 'Mailing %s...' % string.join(people, COMMASPACE)
-
-    if specs == ['-', 'Imported', 'sources']:
-        return
-    if specs[-3:] == ['-', 'New', 'directory']:
-        del specs[-3:]
-    elif len(specs) > 2:
-        L = specs[:2]
-        for s in specs[2:]:
-            prev = L[-1]
-            if string.count(prev, ',') < 2:
-                L[-1] = "%s %s" % (prev, s)
-            else:
-                L.append(s)
-        specs = L
-
-    if verbose:
-        print 'Generating notification message...'
-    blast_mail(subject, people, specs[1:], contextlines, fromhost)
-    if verbose:
-        print 'Generating notification message... done.'
-
-
-
-if __name__ == '__main__':
-    main()
-    sys.exit(0)

DELETED CVSROOT/taginfo
Index: CVSROOT/taginfo
==================================================================
--- CVSROOT/taginfo
+++ /dev/null
@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED CVSROOT/verifymsg
Index: CVSROOT/verifymsg
==================================================================
--- CVSROOT/verifymsg
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

DELETED mttroot/CVSROOT/checkoutlist
Index: mttroot/CVSROOT/checkoutlist
==================================================================
--- mttroot/CVSROOT/checkoutlist
+++ /dev/null
@@ -1,14 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename><whitespace><error message><end-of-line>
-#
-# comment lines begin with '#'
-syncmail

DELETED mttroot/CVSROOT/commitinfo
Index: mttroot/CVSROOT/commitinfo
==================================================================
--- mttroot/CVSROOT/commitinfo
+++ /dev/null
@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED mttroot/CVSROOT/config
Index: mttroot/CVSROOT/config
==================================================================
--- mttroot/CVSROOT/config
+++ /dev/null
@@ -1,11 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Set `PreservePermissions' to `yes' to save file status information
-# in the repository.
-#PreservePermissions=no
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no

DELETED mttroot/CVSROOT/cvswrappers
Index: mttroot/CVSROOT/cvswrappers
==================================================================
--- mttroot/CVSROOT/cvswrappers
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -t/-f options allow one to treat directories of files
-# as a single file, or to transform a file in other ways on
-# its way in and out of CVS.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'

DELETED mttroot/CVSROOT/editinfo
Index: mttroot/CVSROOT/editinfo
==================================================================
--- mttroot/CVSROOT/editinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

DELETED mttroot/CVSROOT/loginfo
Index: mttroot/CVSROOT/loginfo
==================================================================
--- mttroot/CVSROOT/loginfo
+++ /dev/null
@@ -1,31 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
-
-# Lines to mail changes
-CVSROOT $CVSROOT/CVSROOT/syncmail %{sVv} mtt@gawthrop.net
-DEFAULT $CVSROOT/CVSROOT/syncmail %{sVv} mtt-cvs@lists.sourceforge.net
-

DELETED mttroot/CVSROOT/modules
Index: mttroot/CVSROOT/modules
==================================================================
--- mttroot/CVSROOT/modules
+++ /dev/null
@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.

DELETED mttroot/CVSROOT/notify
Index: mttroot/CVSROOT/notify
==================================================================
--- mttroot/CVSROOT/notify
+++ /dev/null
@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail %s -s "CVS notification"

DELETED mttroot/CVSROOT/rcsinfo
Index: mttroot/CVSROOT/rcsinfo
==================================================================
--- mttroot/CVSROOT/rcsinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED mttroot/CVSROOT/syncmail
Index: mttroot/CVSROOT/syncmail
==================================================================
--- mttroot/CVSROOT/syncmail
+++ /dev/null
@@ -1,287 +0,0 @@
-#! /usr/bin/python
-
-# NOTE: Until SourceForge installs a modern version of Python on the cvs
-# servers, this script MUST be compatible with Python 1.5.2.
-
-"""Complicated notification for CVS checkins.
-
-This script is used to provide email notifications of changes to the CVS
-repository.  These email changes will include context diffs of the changes.
-Really big diffs will be trimmed.
-
-This script is run from a CVS loginfo file (see $CVSROOT/CVSROOT/loginfo).  To
-set this up, create a loginfo entry that looks something like this:
-
-    mymodule /path/to/this/script %%s some-email-addr@your.domain
-
-In this example, whenever a checkin that matches `mymodule' is made, this
-script is invoked, which will generate the diff containing email, and send it
-to some-email-addr@your.domain.
-
-    Note: This module used to also do repository synchronizations via
-    rsync-over-ssh, but since the repository has been moved to SourceForge,
-    this is no longer necessary.  The syncing functionality has been ripped
-    out in the 3.0, which simplifies it considerably.  Access the 2.x versions
-    to refer to this functionality.  Because of this, the script is misnamed.
-
-It no longer makes sense to run this script from the command line.  Doing so
-will only print out this usage information.
-
-Usage:
-
-    %(PROGRAM)s [options] <%%S> email-addr [email-addr ...]
-
-Where options is:
-
-    --cvsroot=<path>
-    	Use <path> as the environment variable CVSROOT.  Otherwise this
-    	variable must exist in the environment.
-
-    --help / -h
-        Print this text.
-
-    --context=#
-    -C #
-        Include # lines of context around lines that differ (default: 2).
-
-    -c
-        Produce a context diff (default).
-
-    -u
-        Produce a unified diff (smaller).
-
-    --quiet/-q
-        Don't print as much status to stdout.
-
-    <%%S>
-        CVS %%s loginfo expansion.  When invoked by CVS, this will be a single
-        string containing the directory the checkin is being made in, relative
-        to $CVSROOT, followed by the list of files that are changing.  If the
-        %%s in the loginfo file is %%{sVv}, context diffs for each of the
-        modified files are included in any email messages that are generated.
-
-    email-addrs
-        At least one email address.
-"""
-import os
-import sys
-import time
-import string
-import getopt
-import smtplib
-import pwd
-import socket
-
-from cStringIO import StringIO
-
-# Which SMTP server to do we connect to?  Empty string means localhost.
-MAILHOST = ''
-MAILPORT = 25
-
-# Diff trimming stuff
-DIFF_HEAD_LINES = 20
-DIFF_TAIL_LINES = 20
-DIFF_TRUNCATE_IF_LARGER = 1000
-
-EMPTYSTRING = ''
-SPACE = ' '
-DOT = '.'
-COMMASPACE = ', '
-
-PROGRAM = sys.argv[0]
-
-BINARY_EXPLANATION_LINES = [
-    "(This appears to be a binary file; contents omitted.)\n"
-    ]
-
-
-def usage(code, msg=''):
-    print __doc__ % globals()
-    if msg:
-        print msg
-    sys.exit(code)
-
-
-
-def calculate_diff(filespec, contextlines):
-    try:
-        file, oldrev, newrev = string.split(filespec, ',')
-    except ValueError:
-        # No diff to report
-        return '***** Bogus filespec: %s' % filespec
-    if oldrev == 'NONE':
-        try:
-            if os.path.exists(file):
-                fp = open(file)
-            else:
-                update_cmd = 'cvs -fn update -r %s -p %s' % (newrev, file)
-                fp = os.popen(update_cmd)
-            lines = fp.readlines()
-            fp.close()
-            # Is this a binary file?  Let's look at the first few
-            # lines to figure it out:
-            for line in lines[:5]:
-                for c in string.rstrip(line):
-                    if c in string.whitespace:
-                        continue
-                    if c < ' ' or c > chr(127):
-                        lines = BINARY_EXPLANATION_LINES[:]
-                        break
-            lines.insert(0, '--- NEW FILE: %s ---\n' % file)
-        except IOError, e:
-            lines = ['***** Error reading new file: ',
-                     str(e), '\n***** file: ', file, ' cwd: ', os.getcwd()]
-    elif newrev == 'NONE':
-        lines = ['--- %s DELETED ---\n' % file]
-    else:
-        # This /has/ to happen in the background, otherwise we'll run into CVS
-        # lock contention.  What a crock.
-        if contextlines > 0:
-            difftype = "-C " + str(contextlines)
-        else:
-            difftype = "-u"
-        diffcmd = "/usr/bin/cvs -f diff -kk %s --minimal -r %s -r %s '%s'" % (
-            difftype, oldrev, newrev, file)
-        fp = os.popen(diffcmd)
-        lines = fp.readlines()
-        sts = fp.close()
-        # ignore the error code, it always seems to be 1 :(
-##        if sts:
-##            return 'Error code %d occurred during diff\n' % (sts >> 8)
-    if len(lines) > DIFF_TRUNCATE_IF_LARGER:
-        removedlines = len(lines) - DIFF_HEAD_LINES - DIFF_TAIL_LINES
-        del lines[DIFF_HEAD_LINES:-DIFF_TAIL_LINES]
-        lines.insert(DIFF_HEAD_LINES,
-                     '[...%d lines suppressed...]\n' % removedlines)
-    return string.join(lines, '')
-
-
-
-def getdomain():
-    try:
-        fqdn = socket.getfqdn()
-    except AttributeError:
-        # Python 1.5.2 :(
-        hostname = socket.gethostname()
-        byaddr = socket.gethostbyaddr(socket.gethostbyname(hostname))
-        aliases = byaddr[1]
-        aliases.insert(0, byaddr[0])
-        aliases.insert(0, hostname)
-        for fqdn in aliases:
-            if '.' in fqdn:
-                break
-        else:
-            fqdn = 'localhost.localdomain'
-    parts = string.split(fqdn, DOT)
-    return string.join(parts[1:], DOT)
-
-
-
-def blast_mail(subject, people, filestodiff, contextlines):
-    # cannot wait for child process or that will cause parent to retain cvs
-    # lock for too long.  Urg!
-    if not os.fork():
-        # in the child
-        # give up the lock you cvs thang!
-        time.sleep(2)
-        # Create the smtp connection to the localhost
-        conn = smtplib.SMTP()
-        conn.connect(MAILHOST, MAILPORT)
-        user = pwd.getpwuid(os.getuid())[0]
-        domain = getdomain()
-        author = '%s@%s' % (user, domain)
-        s = StringIO()
-        sys.stdout = s
-        try:
-            print '''\
-From: %(author)s
-To: %(people)s
-Subject: %(subject)s
-''' % {'author' : author,
-       'people' : string.join(people, COMMASPACE),
-       'subject': subject,
-       }
-            s.write(sys.stdin.read())
-            # append the diffs if available
-            print
-            for file in filestodiff:
-                print calculate_diff(file, contextlines)
-        finally:
-            sys.stdout = sys.__stdout__
-        resp = conn.sendmail(author, people, s.getvalue())
-        conn.close()
-        os._exit(0)
-
-
-
-# scan args for options
-def main():
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hC:cuq',
-                                   ['context=', 'cvsroot=', 'help', 'quiet'])
-    except getopt.error, msg:
-        usage(1, msg)
-
-    # parse the options
-    contextlines = 2
-    verbose = 1
-    for opt, arg in opts:
-        if opt in ('-h', '--help'):
-            usage(0)
-        elif opt == '--cvsroot':
-            os.environ['CVSROOT'] = arg
-        elif opt in ('-C', '--context'):
-            contextlines = int(arg)
-        elif opt == '-c':
-            if contextlines <= 0:
-                contextlines = 2
-        elif opt == '-u':
-            contextlines = 0
-        elif opt in ('-q', '--quiet'):
-            verbose = 0
-
-    # What follows is the specification containing the files that were
-    # modified.  The argument actually must be split, with the first component
-    # containing the directory the checkin is being made in, relative to
-    # $CVSROOT, followed by the list of files that are changing.
-    if not args:
-        usage(1, 'No CVS module specified')
-    subject = args[0]
-    specs = string.split(args[0])
-    del args[0]
-
-    # The remaining args should be the email addresses
-    if not args:
-        usage(1, 'No recipients specified')
-
-    # Now do the mail command
-    people = args
-
-    if verbose:
-        print 'Mailing %s...' % string.join(people, COMMASPACE)
-
-    if specs == ['-', 'Imported', 'sources']:
-        return
-    if specs[-3:] == ['-', 'New', 'directory']:
-        del specs[-3:]
-    elif len(specs) > 2:
-        L = specs[:2]
-        for s in specs[2:]:
-            prev = L[-1]
-            if string.count(prev, ',') < 2:
-                L[-1] = "%s %s" % (prev, s)
-            else:
-                L.append(s)
-        specs = L
-
-    if verbose:
-        print 'Generating notification message...'
-    blast_mail(subject, people, specs[1:], contextlines)
-    if verbose:
-        print 'Generating notification message... done.'
-
-
-
-if __name__ == '__main__':
-    main()
-    sys.exit(0)

DELETED mttroot/CVSROOT/taginfo
Index: mttroot/CVSROOT/taginfo
==================================================================
--- mttroot/CVSROOT/taginfo
+++ /dev/null
@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

DELETED mttroot/CVSROOT/verifymsg
Index: mttroot/CVSROOT/verifymsg
==================================================================
--- mttroot/CVSROOT/verifymsg
+++ /dev/null
@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

Index: mttroot/mtt/bin/mtt
==================================================================
--- mttroot/mtt/bin/mtt
+++ mttroot/mtt/bin/mtt
@@ -15,10 +15,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Header$
 ## $Log$
+## Revision 1.360  2002/08/20 15:51:16  gawthrop
+## Update to work with ident DIY rep
+##
 ## Revision 1.359  2002/08/07 14:27:14  geraint
 ## Changes to make "-i dassl" work again.
 ##
 ## Revision 1.358  2002/08/07 11:04:40  geraint
 ## Now updates timestamp on lbl.txt after processing in make. This eliminates the delay where MTT spends a long period of time uselessly recursing through the model on subsequent passes if the label file is older than the bondgraph.
@@ -1459,12 +1462,16 @@
 	-oct )
                 fixcc='-fixcc'
                 mtt_switches="$mtt_switches $1";
                 using_oct=yes;
                 ;;
-	-opt )  mtt_switches="$mtt_switches $1";
-                optimise='-optimise';;
+	-opt | -optl )
+		mtt_switches="$mtt_switches $1";
+                optimise='-optimise_local';;
+	-optg )
+		mtt_switches="$mtt_switches $1";
+                optimise='-optimise_global';;
 	-partition ) mtt_switches="$mtt_switches $1";
                      partition='-partition';
                 ;;
 	-pdf )   mtt_switches="$mtt_switches $1";
                  ps=pdf; 
@@ -1553,11 +1560,13 @@
     echo '         -dc Maximise derivative (not integral) causality'
     echo '         -i <implicit|euler|rk4|dassl>   Use implicit, euler, rk4 or dassl integration'
     echo '         -ae <reduce|hybrd|dassl|hooke>   Solve algebraic equations with specified solver'
     echo '         -o ode is same as dae'
     echo '         -oct use oct files in place of m files where appropriate'
-    echo '         -opt optimise code generation'
+    echo '         -opt optimise code generation (equivalent to -lopt)'
+    echo '         -optl optimise code generation (local  : line-by-line)'
+    echo '         -optg optimise code generation (global : full vector)'
     echo '         -p  print environment variables'
     echo '         -partition partition hierachical system'
     echo '         -pdf generate pdf in place of ps'
     echo '         -r  reset time stamp on representation'
     echo '         -s  generate sensitivity BG (use mtt -s sSys rep lang)'

Index: mttroot/mtt/bin/trans/cse2ode_r
==================================================================
--- mttroot/mtt/bin/trans/cse2ode_r
+++ mttroot/mtt/bin/trans/cse2ode_r
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.3  2001/07/27 23:29:10  geraint
+## Optimises only when requested (-opt).
+##
 ## Revision 1.2  2001/07/13 04:54:04  geraint
 ## Branch merge: numerical-algebraic-solution back to main.
 ##
 ## Revision 1.1.4.1  2001/05/04 04:07:24  geraint
 ## Numerical solution of algebraic equations.
@@ -34,13 +37,16 @@
 ###############################################################
 
 optimise=''; optimise_msg=''
 while [ -n "`echo $1 | grep '^-'`" ]; do
     case $1 in
-	-optimise)
-	    optimise='-optimise'
-	    optimise_msg=' with optimisation' ;;
+	-optimise_global )
+	    optimise='-optimise_global'
+	    optimise_msg=' with global optimisation' ;;
+	-optimise_local )
+	    optimise='-optimise_local'
+	    optimise_msg=' with local optimisation' ;;
 	*)
 	    echo "$1 is an invalid argument - ignoring" ;;
     esac
     shift
 done
@@ -126,16 +132,13 @@
 in ("$1_odeo_write.r");
 write "END;";
 SHUT "$1_odeo.r";
 quit;
 EOF
+
+if [ ${optimise:-""} = "-optimise_global" ]; then
+    mtt_optimise_global $1 ode
+    mtt_optimise_global $1 odeo
+fi
 
 # Now invoke the standard error handling.
 mtt_error_r cse2ode_r.log
-
-
-
-
-
-
-
-

Index: mttroot/mtt/bin/trans/cse2smx_lang
==================================================================
--- mttroot/mtt/bin/trans/cse2smx_lang
+++ mttroot/mtt/bin/trans/cse2smx_lang
@@ -23,11 +23,11 @@
 	parameters='-parameters';
 	;;
     -matrix)
 	matrix='yes';
 	;;
-    -optimise)
+    -optimise_global | -optimise_local )
 	optimise='LOAD SCOPE; ON GENTRANOPT;';
         iname='INAME mtt_o;';
 	;;
     -fixcc )
         fix_mtt_pow='FOR ALL x,y LET x^y = mtt_pow(x,y);'

Index: mttroot/mtt/bin/trans/csm2sm_r
==================================================================
--- mttroot/mtt/bin/trans/csm2sm_r
+++ mttroot/mtt/bin/trans/csm2sm_r
@@ -12,10 +12,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.2  2001/07/27 23:29:10  geraint
+## Optimises only when requested (-opt).
+##
 ## Revision 1.1  2000/12/28 12:24:03  peterg
 ## Put under RCS
 ##
 ## Revision 1.2  1996/08/25 10:11:32  peter
 ## Added END in output file.
@@ -27,14 +30,17 @@
 ###############################################################
 
 optimise=''; optimise_msg=''
 while [ -n "`echo $1 | grep '^-'`" ]; do
     case $1 in
-	-optimise)
-	    optimise='-optimise'
-	    optimise_msg=' with optimisation' ;;
-	*)
+	-optimise_global )
+	    optimise='-optimise_global'
+	    optimise_msg=' with global optimisation' ;;
+       	-optimise_local )
+	    optimise='-optimise_local'
+	    optimise_msg=' with local optimisation' ;;
+	* )
 	    echo "$1 is an invalid argument - ignoring" ;;
     esac
     shift
 done
 
@@ -135,8 +141,12 @@
 quit;
 
 EOF
 
 cat $1_$2.r1 $1_$2.r2 > $1_$2.r
+
+if [ ${optimise:-""} = "-optimise_global" ]; then
+    mtt_optimise_global $1 $2
+fi
 
 # Now invoke the standard error handling.
 mtt_error_r csm2sm_r.log

Index: mttroot/mtt/bin/trans/dae2cse_r
==================================================================
--- mttroot/mtt/bin/trans/dae2cse_r
+++ mttroot/mtt/bin/trans/dae2cse_r
@@ -13,10 +13,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.23  2002/07/10 17:43:05  geraint
+## Added feature [ 562453 ] Optimisation of algebraic equations.
+##
 ## Revision 1.22  2002/06/28 15:35:47  geraint
 ## Commented out aej.r generation (not used yet).
 ##
 ## Revision 1.21  2002/06/28 10:13:40  geraint
 ## Includes fix_c.r in ese2rdae and def2write_r to eliminate occurrances of x**y.
@@ -132,13 +135,16 @@
 	-fixcc )
 		fixcc='-fixcc'
                 include=`echo 'in "'$MTT_LIB'/reduce/fix_c.r";'`
                 fix_msg='fixing c and cc code';
 		;;
-	-optimise)
-	    optimise='-optimise'
-	    optimise_msg=' with optimisation' ;;
+        -optimise_global )
+	    optimise='-optimise_global'
+	    optimise_msg=' with global optimisation' ;;
+	-optimise_local )
+	    optimise='-optimise_local'
+	    optimise_msg=' with local optimisation' ;;
         *)
                 echo "$1 is an invalid argument - ignoring" ;;
   esac
   shift
 done
@@ -470,10 +476,17 @@
 touch $1_cseo.r2
 cat $1_ae.r1 $1_ae.r2 > $1_ae.r
 cat $1_cse.r1 $1_cse.r2  > $1_cse.r
 cat $1_csex.r1 $1_csex.r2  > $1_csex.r
 cat $1_cseo.r1 $1_cseo.r2  > $1_cseo.r
+
+if [ ${optimise:-""} = "-optimise_global" ]; then
+    mtt_optimise_global $1 ae
+# TODO:    mtt_optimise_global $1 cse
+# TODO:    mtt_optimise_global $1 cseo
+# TODO:    mtt_optimise_global $1 csex
+fi
 
 if [ "$solve" = "1" ]; then
     echo "Setting MTTNyz=0 in $1_def.r and updating other $1_def files"
     gawk '{
      if ($1=="MTTNyz") 

Index: mttroot/mtt/bin/trans/dae2lde_r
==================================================================
--- mttroot/mtt/bin/trans/dae2lde_r
+++ mttroot/mtt/bin/trans/dae2lde_r
@@ -11,21 +11,27 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.2  2001/07/27 23:29:10  geraint
+## Optimises only when requested (-opt).
+##
 ## Revision 1.1  2000/12/28 12:25:13  peterg
 ## Initial revision
 ##
 ###############################################################
 
 optimise=''; optimise_msg=''
 while [ -n "`echo $1 | grep '^-'`" ]; do
     case $1 in
-	-optimise)
-	    optimise='-optimise'
-	    optimise_msg=' with optimisation' ;;
+	-optimise_global )
+	    optimise='-optimise_global'
+	    optimise_msg=' with global optimisation' ;;
+	-optimise_local )
+	    optimise='-optimise_local'
+	    optimise_msg=' with local optimisation' ;;
 	*)
 	    echo "$1 is an invalid argument - ignoring" ;;
     esac
     shift
 done
@@ -116,10 +122,15 @@
 in ("$1_ldeo_write.r");
 write "END;";
 SHUT "$1_ldeo.r";
 quit;
 EOF
+
+if [ ${optimise:-""} = "-optimise_global" ]; then
+# TODO:    global_optimise $1 lde
+# TODO:    global_optimise $1 ldeo
+fi
 
 # Now invoke the standard error handling.
 mtt_error_r cse2lde_r.log
 
 

Index: mttroot/mtt/bin/trans/def2write_r
==================================================================
--- mttroot/mtt/bin/trans/def2write_r
+++ mttroot/mtt/bin/trans/def2write_r
@@ -11,10 +11,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.16  2002/09/03 19:34:15  geraint
+## Write EdX regardless - csex is needed to create ode when not optimised.
+##
 ## Revision 1.15  2002/08/29 15:45:20  geraint
 ## Tests for existence of matrix before entering shell loop.
 ## Tests for existence of expression before attempting to write or optimise.
 ##
 ## Revision 1.14  2002/08/09 14:34:45  geraint
@@ -74,13 +77,16 @@
 ###############################################################
 
 optimise=''
 while [ -n "`echo $1 | grep '^-'`" ]; do
     case $1 in
-	-optimise)
-	    opt='-optimise'
-	    optimise_msg=' with optimisation' ;;
+	-optimise_global )
+	    opt=''
+	    optimise_msg='' ;;
+	-optimise_local )
+	    opt='-optimise_local'
+	    optimise_msg=' with local optimisation' ;;
 	-fixcc )
 	    include=`echo 'in "'$MTT_LIB'/reduce/fix_c.r";'` ;;
 	*)
 	    echo "$1 is an invalid argument - ignoring" ;;
     esac
@@ -151,28 +157,11 @@
     *)
         echo def2write_r: representation $rep not recognised
         exit
 esac
 
-
-mtt_fix_integers ()
-{
-    gawk -F":=" -v RS="$" -v ORS="$\n" '
-(NF == 1) {
-	print $0
-}
-(NF > 1) {
-	lhs=$1 ;
-	rhs=$2" " ;
-	rhs1 = gensub ( /([^A-Za-z_0-9\.\+])([0-9]+)([^\.0-9])/ , "\\1\\2.0\\3" , "g", rhs );
-	rhs2 = gensub ( /([^e]\+)([0-9]+)([^\.0-9])/ , "\\1\\2.0\\3" , "g", rhs1 );
-	rhs3 = gensub ( /([^A-Za-z_0-9\.\+])([0-9]+)e([0-9]+).0([^\.0-9])/ , "\\1\\2\\3\\4" , "g" , rhs)
-	printf "%s:=%s$\n", lhs, rhs3 ;
-    }'
-}
-
-mtt_optimise ()
+mtt_optimise_local ()
 {
     sys="$1"
     lhs="$2"
     rhs="$3"
     
@@ -223,11 +212,11 @@
 rm -f def2write_r1.log def2write_r2.log
 
 # Write out the code
 echo "" > $1_$2_write.r
 
-if [ ${opt:-""} = "-optimise" ]; then
+if [ ${opt:-""} = "-optimise_local" ]; then
     echo 'off nat$'
 #    echo 'on echo$'
 else
     echo 'off echo$'
     echo 'load gentran$'
@@ -241,13 +230,13 @@
 	is=`n2m 1 $n`; 
 	js=`n2m 1 $m`; 
 	if [ $n -ge 1 ]; then
 	    for i in $is; do
 		for j in $js; do
-		    if [ ${opt:-""} = "-optimise" ]; then
+		    if [ ${opt:-""} = "-optimise_local" ]; then
 			name=`echo MTT$matrix'('$i','$j')'`
-			mtt_optimise $1 "$comma$name" "$name"
+			mtt_optimise_local $1 "$comma$name" "$name"
 			comma=''
 		    else
 			echo 'write'
 			name=`echo MTT$matrix'('$i','$j')'`
 			echo '  '$comma$name ':=' $name '$'

Index: mttroot/mtt/bin/trans/m/args2arg.m
==================================================================
--- mttroot/mtt/bin/trans/m/args2arg.m
+++ mttroot/mtt/bin/trans/m/args2arg.m
@@ -26,6 +26,28 @@
 
 % Field separator
 if nargin<3
   FS = ';';
 end;
+
+arg = '';
+if strcmp(args, '')==0
+  L = length(args);
+  args_count = 0;
+  for i=1:n
+    arg_count = 0;
+    arg = '';
+    if args_count == L
+      break;
+    end;  
+    while args_count < L
+      args_count = args_count+1;
+      arg_count = arg_count+1;
+      ch = str2ch(args,args_count);
+      if ch==FS
+	break;
+      end;
+      arg = [arg ch];
+    end;
+  end;
+end;
 

ADDED   mttroot/mtt/bin/trans/mtt_fix_integers
Index: mttroot/mtt/bin/trans/mtt_fix_integers
==================================================================
--- /dev/null
+++ mttroot/mtt/bin/trans/mtt_fix_integers
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+mttmatrix='\(mtt[A-Za-z][A-Za-z]*\)'
+integer='\([0-9][0-9]*\)'
+
+exec gawk -v RS=${1:-"$"} -v ORS=${2:-"$\n"} ' {
+str = $0;
+str1 = gensub ( /([^A-Za-z_0-9\.\+])([0-9]+)([^\.0-9])/ , "\\1\\2.0\\3" , "g", str );
+str2 = gensub ( /([^e]\+)([0-9]+)([^\.0-9])/ , "\\1\\2.0\\3" , "g", str1 );
+str3 = gensub ( /([^A-Za-z_0-9\.\+])([0-9]+)e([0-9]+).0([^\.0-9])/ , "\\1\\2\\3\\4" , "g" , str2)
+printf "%s$\n", str3 ;
+}' | sed -e "s/$mttmatrix($integer\.0,/\1(\2,/g"

ADDED   mttroot/mtt/bin/trans/mtt_optimise_global
Index: mttroot/mtt/bin/trans/mtt_optimise_global
==================================================================
--- /dev/null
+++ mttroot/mtt/bin/trans/mtt_optimise_global
@@ -0,0 +1,63 @@
+#! /bin/sh
+
+# script uses Reduce + Scope to optimise an entire vector
+
+system=$1
+representation=$2
+
+# error codes
+E_REP_NOT_SUPPORTED=-19
+E_FILE_NOT_EXIST=-20
+
+case $representation in
+    ae)
+	matrix=yz ;
+	nmatrix=`mtt_getsize $system yz` ;;
+    ode)
+	matrix=dx ;
+	nmatrix=`mtt_getsize $system x` ;;
+    cseo | odeo)
+	matrix=y ;
+	nmatrix=`mtt_getsize $system y` ;;
+    *)
+	exit $E_REP_NOT_SUPPORTED;;
+esac
+
+# Generate a command of the form
+# optimise mtt?(1,1) :=: mtt?(1,1), mtt?(2,1) :=: mtt?(2,1), ..., INAME mtt_tmp$
+command="optimize"
+counter=1
+while [ $counter -le $nmatrix ]; do
+    command="$command mtt$matrix($counter,1) :=: mtt$matrix($counter,1),"
+    counter=`expr $counter + 1`
+done
+command="$command INAME mtt_tmp$"
+
+logfile=${system}_${representation}_global_optimisation.log
+tmpfile=${system}_${representation}_global_optimisation.tmp
+outfile=${system}_${representation}.r
+
+if [ ! -f $outfile ]; then
+    exit $E_FILE_NOT_EXIST
+fi
+
+# Use Reduce to perform the optimisation
+${SYMBOLIC:-reduce} <<EOF > $logfile 2>&1
+off nat$
+in "${system}_def.r"$
+matrix mtt$matrix($nmatrix,1)$
+in "$outfile"$
+load scope$
+out "$tmpfile"$
+$command
+shut "$tmpfile"$
+$end$
+EOF
+
+cp $outfile $outfile.unoptimised
+cp $tmpfile $outfile.tmp
+cat $tmpfile | mtt_fix_integers > $outfile
+#cp $tmpfile $outfile
+echo ";end;" >> $outfile
+
+mtt_error_r $logfile

Index: mttroot/mtt/bin/trans/mtt_r2m
==================================================================
--- mttroot/mtt/bin/trans/mtt_r2m
+++ mttroot/mtt/bin/trans/mtt_r2m
@@ -16,10 +16,13 @@
 ###############################################################
 ## Version control history
 ###############################################################
 ## $Id$
 ## $Log$
+## Revision 1.30  2002/03/26 11:59:54  geraint
+## Added dummy -optimise switch to prevent falling over for -cc generation.
+##
 ## Revision 1.29  2001/09/07 00:25:56  geraint
 ## Partial fix for insidious bug which eliminates lines of code when parameter
 ## names of the form (in* or off*) start continuation lines.
 ##
 ## Revision 1.28  2001/07/13 04:54:04  geraint
@@ -127,11 +130,11 @@
 	;;
     -parameters)
 	parameters='-parameters';
         par='mttpar'
 	;;
-    -optimise)
+    -optimise_local | -optimise_global )
 	;;
     *)
 	echo $1 is an unknown option
         exit;;
   esac