Commit 5343fad5 authored by Colin Eles's avatar Colin Eles
Browse files

fixed a bug with trig libraries 

git-svn-id: https://groke.mcmaster.ca/svn/grad/colin/trunk/TableTool@6916 57e6efec-57d4-0310-aeb1-a6c144bb1a8b
parent 6c8b4b81

@CVC_checker/cvc_check.m

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ function [ check, seqs ] = cvc_check( object ) 
    waitbar(.10,box,'Running Proof');



    % run the cvc command

[status, result] = system(['cvc3 ' filename ' +model']);

[status, result] = system(['cvc3 ' filename ' +model'])



% check return status for errors

if (status ~= 0)

@PVS_checker/pvs_check.m

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ if (exists == 1 && (isempty(button) || strcmp(button,'Cancel'))) 
    output = 'canceled';

    return;

elseif (exists == 1 && (strcmp(button,'Open PVS')));

    [status, result] = system(['pvs ' function_name '.pvs']);

    [status, result] = system(['pvs ' function_name '.pvs'])

    output = 'canceled';

elseif (exists == 0 || strcmp(button,'Attempt to prove'))

    box = waitbar(0,'Generating Proof Script');

@PVS_checker/pvs_check_for_imports.m

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ function string = pvs_check_for_imports(object) 


hashtable = {{'sqrt', 'reals@sqrt'} {'sin', 'trig@trig_basic'} {'cos', 'trig@trig_basic'} {'tan', 'trig@trig_basic'}};

for k=1:size(hashtable,2)

            if ~isempty(regexp(object.data.function_inputs,hashtable{k}(1),'once'))

    functions = regexp(object.data.function_inputs,hashtable{k}(1),'once')

            if ~isempty(functions{1})

                if (~any(ismember(found,hashtable{k}(1))))

                string = [string 'IMPORTING ' char(hashtable{k}(2)) sprintf('\n')];

                found = [found hashtable{k}(1)];

@Settings/init.m

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ function [] = init(object) 
object.pvs_includes = [];

object.counter_trials = 1000;

object.counter_range = 100;

object.exception = 0;

object.except = 0;

end

@Settings/setvalues.m

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ object.counter_range = settings.range; 
if ~isfield(settings,'except')

    settings.except = 0;

end

%object.except = settings.except;

object.except = 1;

object.except = settings.except;

end