src/HOL/Tools/Sledgehammer/MaSh/src/mashOld.py
author blanchet
Tue, 20 Aug 2013 14:36:22 +0200
changeset 53100 1133b9e83f09
permissions -rwxr-xr-x
new version of MaSh tool -- experimental server
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
53100
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     1
#!/usr/bin/python
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     2
#     Title:      HOL/Tools/Sledgehammer/MaSh/src/mash.py
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     3
#     Author:     Daniel Kuehlwein, ICIS, Radboud University Nijmegen
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     4
#     Copyright   2012
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     5
#
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     6
# Entry point for MaSh (Machine Learning for Sledgehammer).
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     7
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     8
'''
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
     9
MaSh - Machine Learning for Sledgehammer
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    10
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    11
MaSh allows to use different machine learning algorithms to predict relevant fact for Sledgehammer.
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    12
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    13
Created on July 12, 2012
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    14
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    15
@author: Daniel Kuehlwein
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    16
'''
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    17
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    18
import logging,datetime,string,os,sys
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    19
from argparse import ArgumentParser,RawDescriptionHelpFormatter
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    20
from time import time
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    21
from stats import Statistics
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    22
from theoryStats import TheoryStatistics
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    23
from theoryModels import TheoryModels
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    24
from dictionaries import Dictionaries
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    25
#from fullNaiveBayes import NBClassifier
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    26
from sparseNaiveBayes import sparseNBClassifier
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    27
from snow import SNoW
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    28
from predefined import Predefined
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    29
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    30
# Set up command-line parser
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    31
parser = ArgumentParser(description='MaSh - Machine Learning for Sledgehammer.  \n\n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    32
MaSh allows to use different machine learning algorithms to predict relevant facts for Sledgehammer.\n\n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    33
--------------- Example Usage ---------------\n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    34
First initialize:\n./mash.py -l test.log -o ../tmp/ --init --inputDir ../data/Jinja/ \n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    35
Then create predictions:\n./mash.py -i ../data/Jinja/mash_commands -p ../data/Jinja/mash_suggestions -l test.log -o ../tmp/ --statistics\n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    36
\n\n\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    37
Author: Daniel Kuehlwein, July 2012',formatter_class=RawDescriptionHelpFormatter)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    38
parser.add_argument('-i','--inputFile',help='File containing all problems to be solved.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    39
parser.add_argument('-o','--outputDir', default='../tmp/',help='Directory where all created files are stored. Default=../tmp/.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    40
parser.add_argument('-p','--predictions',default='../tmp/%s.predictions' % datetime.datetime.now(),
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    41
                    help='File where the predictions stored. Default=../tmp/dateTime.predictions.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    42
parser.add_argument('--numberOfPredictions',default=200,help="Number of premises to write in the output. Default=200.",type=int)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    43
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    44
parser.add_argument('--init',default=False,action='store_true',help="Initialize Mash. Requires --inputDir to be defined. Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    45
parser.add_argument('--inputDir',default='../data/20121212/Jinja/',\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    46
                    help='Directory containing all the input data. MaSh expects the following files: mash_features,mash_dependencies,mash_accessibility')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    47
parser.add_argument('--depFile', default='mash_dependencies',
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    48
                    help='Name of the file with the premise dependencies. The file must be in inputDir. Default = mash_dependencies')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    49
parser.add_argument('--saveModel',default=False,action='store_true',help="Stores the learned Model at the end of a prediction run. Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    50
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    51
parser.add_argument('--learnTheories',default=False,action='store_true',help="Uses a two-lvl prediction mode. First the theories, then the premises. Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    52
# Theory Parameters
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    53
parser.add_argument('--theoryDefValPos',default=-7.5,help="Default value for positive unknown features. Default=-7.5.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    54
parser.add_argument('--theoryDefValNeg',default=-10.0,help="Default value for negative unknown features. Default=-15.0.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    55
parser.add_argument('--theoryPosWeight',default=2.0,help="Weight value for positive features. Default=2.0.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    56
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    57
parser.add_argument('--nb',default=False,action='store_true',help="Use Naive Bayes for learning. This is the default learning method.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    58
# NB Parameters
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    59
parser.add_argument('--NBDefaultPriorWeight',default=20.0,help="Initializes classifiers with value * p |- p. Default=20.0.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    60
parser.add_argument('--NBDefVal',default=-15.0,help="Default value for unknown features. Default=-15.0.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    61
parser.add_argument('--NBPosWeight',default=10.0,help="Weight value for positive features. Default=10.0.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    62
# TODO: Rename to sineFeatures
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    63
parser.add_argument('--sineFeatures',default=False,action='store_true',help="Uses a SInE like prior for premise lvl predictions. Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    64
parser.add_argument('--sineWeight',default=0.5,help="How much the SInE prior is weighted. Default=0.5.",type=float)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    65
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    66
parser.add_argument('--snow',default=False,action='store_true',help="Use SNoW's naive bayes instead of Naive Bayes for learning.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    67
parser.add_argument('--predef',help="Use predefined predictions. Used only for comparison with the actual learning. Argument is the filename of the predictions.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    68
parser.add_argument('--statistics',default=False,action='store_true',help="Create and show statistics for the top CUTOFF predictions.\
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    69
                    WARNING: This will make the program a lot slower! Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    70
parser.add_argument('--saveStats',default=None,help="If defined, stores the statistics in the filename provided.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    71
parser.add_argument('--cutOff',default=500,help="Option for statistics. Only consider the first cutOff predictions. Default=500.",type=int)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    72
parser.add_argument('-l','--log', default='../tmp/%s.log' % datetime.datetime.now(), help='Log file name. Default=../tmp/dateTime.log')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    73
parser.add_argument('-q','--quiet',default=False,action='store_true',help="If enabled, only print warnings. Default=False.")
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    74
parser.add_argument('--modelFile', default='../tmp/model.pickle', help='Model file name. Default=../tmp/model.pickle')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    75
parser.add_argument('--dictsFile', default='../tmp/dict.pickle', help='Dict file name. Default=../tmp/dict.pickle')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    76
parser.add_argument('--theoryFile', default='../tmp/theory.pickle', help='Model file name. Default=../tmp/theory.pickle')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    77
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    78
def mash(argv = sys.argv[1:]):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    79
    # Initializing command-line arguments
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    80
    args = parser.parse_args(argv)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    81
    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    82
    # Set up logging
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    83
    logging.basicConfig(level=logging.DEBUG,
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    84
                        format='%(asctime)s %(name)-12s %(levelname)-8s %(message)s',
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    85
                        datefmt='%d-%m %H:%M:%S',
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    86
                        filename=args.log,
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    87
                        filemode='w')    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    88
    logger = logging.getLogger('main.py')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    89
    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    90
    """
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    91
    # remove old handler for tester
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    92
    # TODO: Comment out for Jasmins version. This crashes python 2.6.1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    93
    logger.root.handlers[0].stream.close()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    94
    logger.root.removeHandler(logger.root.handlers[0])
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    95
    file_handler = logging.FileHandler(args.log)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    96
    file_handler.setLevel(logging.DEBUG)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    97
    formatter = logging.Formatter('%(asctime)s %(name)-12s %(levelname)-8s %(message)s')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    98
    file_handler.setFormatter(formatter)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
    99
    logger.root.addHandler(file_handler)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   100
    #"""
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   101
    if args.quiet:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   102
        logger.setLevel(logging.WARNING)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   103
        #console.setLevel(logging.WARNING)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   104
    else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   105
        console = logging.StreamHandler(sys.stdout)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   106
        console.setLevel(logging.INFO)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   107
        formatter = logging.Formatter('# %(message)s')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   108
        console.setFormatter(formatter)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   109
        logging.getLogger('').addHandler(console)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   110
        
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   111
    if not os.path.exists(args.outputDir):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   112
        os.makedirs(args.outputDir)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   113
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   114
    logger.info('Using the following settings: %s',args)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   115
    # Pick algorithm
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   116
    if args.nb:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   117
        logger.info('Using sparse Naive Bayes for learning.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   118
        model = sparseNBClassifier(args.NBDefaultPriorWeight,args.NBPosWeight,args.NBDefVal)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   119
    elif args.snow:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   120
        logger.info('Using naive bayes (SNoW) for learning.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   121
        model = SNoW()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   122
    elif args.predef:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   123
        logger.info('Using predefined predictions.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   124
        model = Predefined(args.predef)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   125
    else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   126
        logger.info('No algorithm specified. Using sparse Naive Bayes.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   127
        model = sparseNBClassifier(args.NBDefaultPriorWeight,args.NBPosWeight,args.NBDefVal)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   128
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   129
    # Initializing model
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   130
    if args.init:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   131
        logger.info('Initializing Model.')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   132
        startTime = time()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   133
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   134
        # Load all data
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   135
        dicts = Dictionaries()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   136
        dicts.init_all(args)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   137
        
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   138
        # Create Model
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   139
        trainData = dicts.featureDict.keys()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   140
        model.initializeModel(trainData,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   141
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   142
        if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   143
            depFile = os.path.join(args.inputDir,args.depFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   144
            theoryModels = TheoryModels(args.theoryDefValPos,args.theoryDefValNeg,args.theoryPosWeight)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   145
            theoryModels.init(depFile,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   146
            theoryModels.save(args.theoryFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   147
            
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   148
        model.save(args.modelFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   149
        dicts.save(args.dictsFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   150
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   151
        logger.info('All Done. %s seconds needed.',round(time()-startTime,2))
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   152
        return 0
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   153
    # Create predictions and/or update model
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   154
    else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   155
        lineCounter = 1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   156
        statementCounter = 1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   157
        computeStats = False
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   158
        dicts = Dictionaries()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   159
        theoryModels = TheoryModels(args.theoryDefValPos,args.theoryDefValNeg,args.theoryPosWeight)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   160
        # Load Files
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   161
        if os.path.isfile(args.dictsFile):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   162
            #logger.info('Loading Dictionaries')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   163
            #startTime = time()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   164
            dicts.load(args.dictsFile)            
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   165
            #logger.info('Done %s',time()-startTime)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   166
        if os.path.isfile(args.modelFile):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   167
            #logger.info('Loading Model')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   168
            #startTime = time()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   169
            model.load(args.modelFile)            
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   170
            #logger.info('Done %s',time()-startTime)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   171
        if os.path.isfile(args.theoryFile) and args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   172
            #logger.info('Loading Theory Models')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   173
            #startTime = time()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   174
            theoryModels.load(args.theoryFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   175
            #logger.info('Done %s',time()-startTime)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   176
        logger.info('All loading completed')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   177
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   178
        # IO Streams
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   179
        OS = open(args.predictions,'w')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   180
        IS = open(args.inputFile,'r')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   181
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   182
        # Statistics
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   183
        if args.statistics:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   184
            stats = Statistics(args.cutOff)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   185
            if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   186
                theoryStats = TheoryStatistics()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   187
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   188
        predictions = None
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   189
        predictedTheories = None
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   190
        #Reading Input File
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   191
        for line in IS:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   192
#           try:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   193
            if True:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   194
                if line.startswith('!'):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   195
                    problemId = dicts.parse_fact(line)    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   196
                    # Statistics
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   197
                    if args.statistics and computeStats:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   198
                        computeStats = False
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   199
                        # Assume '!' comes after '?'
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   200
                        if args.predef:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   201
                            predictions = model.predict(problemId)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   202
                        if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   203
                            tmp = [dicts.idNameDict[x] for x in dicts.dependenciesDict[problemId]]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   204
                            usedTheories = set([x.split('.')[0] for x in tmp]) 
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   205
                            theoryStats.update((dicts.idNameDict[problemId]).split('.')[0],predictedTheories,usedTheories,len(theoryModels.accessibleTheories))                        
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   206
                        stats.update(predictions,dicts.dependenciesDict[problemId],statementCounter)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   207
                        if not stats.badPreds == []:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   208
                            bp = string.join([str(dicts.idNameDict[x]) for x in stats.badPreds], ',')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   209
                            logger.debug('Bad predictions: %s',bp)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   210
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   211
                    statementCounter += 1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   212
                    # Update Dependencies, p proves p
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   213
                    dicts.dependenciesDict[problemId] = [problemId]+dicts.dependenciesDict[problemId]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   214
                    if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   215
                        theoryModels.update(problemId,dicts.featureDict[problemId],dicts.dependenciesDict[problemId],dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   216
                    if args.snow:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   217
                        model.update(problemId,dicts.featureDict[problemId],dicts.dependenciesDict[problemId],dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   218
                    else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   219
                        model.update(problemId,dicts.featureDict[problemId],dicts.dependenciesDict[problemId])
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   220
                elif line.startswith('p'):
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   221
                    # Overwrite old proof.
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   222
                    problemId,newDependencies = dicts.parse_overwrite(line)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   223
                    newDependencies = [problemId]+newDependencies
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   224
                    model.overwrite(problemId,newDependencies,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   225
                    if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   226
                        theoryModels.overwrite(problemId,newDependencies,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   227
                    dicts.dependenciesDict[problemId] = newDependencies
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   228
                elif line.startswith('?'):               
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   229
                    startTime = time()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   230
                    computeStats = True
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   231
                    if args.predef:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   232
                        continue
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   233
                    name,features,accessibles,hints = dicts.parse_problem(line)  
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   234
                        
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   235
                    # Create predictions
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   236
                    logger.info('Starting computation for problem on line %s',lineCounter)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   237
                    # Update Models with hints
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   238
                    if not hints == []:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   239
                        if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   240
                            accessibleTheories = set([(dicts.idNameDict[x]).split('.')[0] for x in accessibles])
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   241
                            theoryModels.update_with_acc('hints',features,hints,dicts,accessibleTheories)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   242
                        if args.snow:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   243
                            pass
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   244
                        else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   245
                            model.update('hints',features,hints)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   246
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   247
                    # Predict premises
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   248
                    if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   249
                        predictedTheories,accessibles = theoryModels.predict(features,accessibles,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   250
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   251
                    # Add additional features on premise lvl if sine is enabled
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   252
                    if args.sineFeatures:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   253
                        origFeatures = [f for f,_w in features]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   254
                        secondaryFeatures = []
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   255
                        for f in origFeatures:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   256
                            if dicts.featureCountDict[f] == 1:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   257
                                continue
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   258
                            triggeredFormulas = dicts.featureTriggeredFormulasDict[f]                                
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   259
                            for formula in triggeredFormulas: 
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   260
                                tFeatures = dicts.triggerFeaturesDict[formula]                                
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   261
                                #tFeatures = [ff for ff,_fw in dicts.featureDict[formula]]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   262
                                newFeatures = set(tFeatures).difference(secondaryFeatures+origFeatures)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   263
                            for fNew in newFeatures:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   264
                                secondaryFeatures.append((fNew,args.sineWeight))
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   265
                        predictionsFeatures = features+secondaryFeatures
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   266
                    else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   267
                        predictionsFeatures = features                    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   268
                    predictions,predictionValues = model.predict(predictionsFeatures,accessibles,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   269
                    assert len(predictions) == len(predictionValues)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   270
                    
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   271
                    # Delete hints
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   272
                    if not hints == []:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   273
                        if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   274
                            theoryModels.delete('hints',features,hints,dicts)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   275
                        if args.snow:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   276
                            pass
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   277
                        else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   278
                            model.delete('hints',features,hints)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   279
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   280
                    logger.info('Done. %s seconds needed.',round(time()-startTime,2))
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   281
                    # Output        
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   282
                    predictionNames = [str(dicts.idNameDict[p]) for p in predictions[:args.numberOfPredictions]]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   283
                    predictionValues = [str(x) for x in predictionValues[:args.numberOfPredictions]]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   284
                    predictionsStringList = ['%s=%s' % (predictionNames[i],predictionValues[i]) for i in range(len(predictionNames))]
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   285
                    predictionsString = string.join(predictionsStringList,' ')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   286
                    outString = '%s: %s' % (name,predictionsString)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   287
                    OS.write('%s\n' % outString)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   288
                else:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   289
                    logger.warning('Unspecified input format: \n%s',line)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   290
                    sys.exit(-1)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   291
                lineCounter += 1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   292
            """
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   293
            except:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   294
                logger.warning('An error occurred on line %s .',line)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   295
                lineCounter += 1
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   296
                continue
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   297
            """
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   298
        OS.close()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   299
        IS.close()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   300
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   301
        # Statistics
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   302
        if args.statistics:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   303
            if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   304
                theoryStats.printAvg()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   305
            stats.printAvg()
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   306
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   307
        # Save
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   308
        if args.saveModel:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   309
            model.save(args.modelFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   310
            if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   311
                theoryModels.save(args.theoryFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   312
        dicts.save(args.dictsFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   313
        if not args.saveStats == None:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   314
            if args.learnTheories:
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   315
                theoryStatsFile = os.path.join(args.outputDir,'theoryStats')
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   316
                theoryStats.save(theoryStatsFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   317
            statsFile = os.path.join(args.outputDir,args.saveStats)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   318
            stats.save(statsFile)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   319
    return 0
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   320
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   321
if __name__ == '__main__':
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   322
    # Cezary Auth  
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   323
    args = ['--statistics', '--init', '--inputDir', '../data/20130118/Jinja', '--log', '../tmp/auth.log', '--theoryFile', '../tmp/t0', '--modelFile', '../tmp/m0', '--dictsFile', '../tmp/d0','--NBDefaultPriorWeight', '20.0', '--NBDefVal', '-15.0', '--NBPosWeight', '10.0']
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   324
    mash(args)
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   325
    args = ['-i', '../data/20130118/Jinja/mash_commands', '-p', '../tmp/auth.pred0', '--statistics', '--cutOff', '500', '--log', '../tmp/auth.log','--modelFile', '../tmp/m0', '--dictsFile', '../tmp/d0']
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   326
    mash(args)   
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   327
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   328
    #sys.exit(mash(args))
1133b9e83f09 new version of MaSh tool -- experimental server
blanchet
parents:
diff changeset
   329
    sys.exit(mash())