Skip to content

Update gppretty.m #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Lenskiy wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update gppretty.m #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions gppretty.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,18 +193,18 @@
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=1:length(evalTree);
geneExpr = gp.fitness.returnvalues{ID}(i+1)*sym(evalTree{i});
geneExpr = gp.fitness.returnvalues{ID}(i+1)*str2sym(evalTree{i});
fullExpr = fullExpr + geneExpr;
exprArray{i+1} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end

else %normal processing where bias is folded into first gene
fullExpr = gp.fitness.returnvalues{ID}(1) + gp.fitness.returnvalues{ID}(2)*sym(evalTree{1});
fullExpr = gp.fitness.returnvalues{ID}(1) + gp.fitness.returnvalues{ID}(2)*str2sym(evalTree{1});
exprArray = cell(1, numel(evalTree));
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=2:length(evalTree);
geneExpr = gp.fitness.returnvalues{ID}(i+1) * sym(evalTree{i});
geneExpr = gp.fitness.returnvalues{ID}(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr + geneExpr;
exprArray{i} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end
Expand Down Expand Up @@ -236,18 +236,18 @@
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=1:length(evalTree);
geneExpr = gp.results.best.returnvalues(i+1) * sym(evalTree{i});
geneExpr = gp.results.best.returnvalues(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr + geneExpr;
exprArray{i+1} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end

else

fullExpr = gp.results.best.returnvalues(1) + gp.results.best.returnvalues(2)*sym(evalTree{1});
fullExpr = gp.results.best.returnvalues(1) + gp.results.best.returnvalues(2)*str2sym(evalTree{1});
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=2:length(evalTree);
geneExpr = gp.results.best.returnvalues(i+1) * sym(evalTree{i});
geneExpr = gp.results.best.returnvalues(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr+geneExpr;
exprArray{i} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end
Expand Down Expand Up @@ -285,17 +285,17 @@
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=1:length(evalTree);
geneExpr = gp.results.valbest.returnvalues(i+1)*sym(evalTree{i});
geneExpr = gp.results.valbest.returnvalues(i+1)*str2sym(evalTree{i});
fullExpr = fullExpr+geneExpr;
exprArray{i+1} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end

else %normal processing (bias folded into first gene)
fullExpr = gp.results.valbest.returnvalues(1) + gp.results.valbest.returnvalues(2)*sym(evalTree{1});
fullExpr = gp.results.valbest.returnvalues(1) + gp.results.valbest.returnvalues(2)*str2sym(evalTree{1});
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=2:length(evalTree);
geneExpr = gp.results.valbest.returnvalues(i+1) * sym(evalTree{i});
geneExpr = gp.results.valbest.returnvalues(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr+geneExpr;
exprArray{i} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end
Expand Down Expand Up @@ -333,17 +333,17 @@
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=1:length(evalTree);
geneExpr = gp.results.testbest.returnvalues(i+1)*sym(evalTree{i});
geneExpr = gp.results.testbest.returnvalues(i+1)*str2sym(evalTree{i});
fullExpr = fullExpr+geneExpr;
exprArray{i+1} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end

else %normal processing (bias folded into first gene)
fullExpr = gp.results.testbest.returnvalues(1) + gp.results.testbest.returnvalues(2)*sym(evalTree{1});
fullExpr = gp.results.testbest.returnvalues(1) + gp.results.testbest.returnvalues(2)*str2sym(evalTree{1});
exprArray{1} = gpsimplify(fullExpr,simplifySteps,verReallyOld,fastMode);

for i=2:length(evalTree);
geneExpr = gp.results.testbest.returnvalues(i+1) * sym(evalTree{i});
geneExpr = gp.results.testbest.returnvalues(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr+geneExpr;
exprArray{i} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end
Expand All @@ -355,12 +355,12 @@
numGenes = numel(ID) - 1;
evalTree = gpreformat(gp,{ID{1:numGenes}},useAlias);
rtnVals = ID{end};
fullExpr = rtnVals(1) + rtnVals(2)*sym(evalTree{1});
fullExpr = rtnVals(1) + rtnVals(2)*str2sym(evalTree{1});
exprArray = cell(1, numel(evalTree)+1);
exprArray{1} = sym(rtnVals(1));
exprArray{1} = str2sym(rtnVals(1));

for i=1:length(evalTree);
geneExpr = rtnVals(i+1) * sym(evalTree{i});
geneExpr = rtnVals(i+1) * str2sym(evalTree{i});
fullExpr = fullExpr + geneExpr;
exprArray{i+1} = gpsimplify(geneExpr,simplifySteps,verReallyOld,fastMode);
end
Expand Down Expand Up @@ -459,4 +459,4 @@

else
error('The Symbolic Math Toolbox is required to use this function.');
end
end