From 4051af5e90ef3550249aa0c769ae01fd493c69d3 Mon Sep 17 00:00:00 2001 From: Anton Antonov <antononcube@gmail.com> Date: Sun, 21 Jul 2013 15:15:31 -0400 Subject: [PATCH] Fixed copy-and-paste bugs of the previous commit. --- AVCDecisionTreeForest.m | 53 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 34 deletions(-) diff --git a/AVCDecisionTreeForest.m b/AVCDecisionTreeForest.m index 9686e5cb..bf0cf4c9 100644 --- a/AVCDecisionTreeForest.m +++ b/AVCDecisionTreeForest.m @@ -203,8 +203,7 @@ Mathematica is (C) Copyright 1988-2012 Wolfram Research, Inc. cdSVDRank_Integer, svdLabels : (All | Automatic | _List)}, preStratifyQ : (True | False)] := - Block[{axes = axesArg, numAxes, numAvcs, numDataRecs, U, S, V, cU, - cS, cV, numRes = {}, crs, inRules}, + Block[{axes = axesArg, numAxes, numAvcs, numDataRecs, U, S, V, cU, cS, cV, numRes = {}, crs, rank, inRules}, (* select linear combination of numerical variables (axes) using thin SVD *) @@ -253,42 +252,28 @@ Mathematica is (C) Copyright 1988-2012 Wolfram Research, Inc. ]; PRINT["AVCSplitSelection:: Dimensions[V]=", Dimensions[V]]; PRINT["AVCSplitSelection:: Dimensions[cV]=", Dimensions[cV]]; - V = Transpose[Union[Join[Transpose[V], Transpose[cV]], SameTest -> (Abs[#1.#2] >= 0.98 &)]]; + If[cdSVDRank > 0, + V = Transpose[Union[Join[Transpose[V], Transpose[cV]], SameTest -> (Abs[#1.#2] >= 0.98 &)]]]; PRINT["AVCSplitSelection:: After union of directions Dimensions[V]=", Dimensions[V]]; - {numRes} = - MapThread[ - Function[{V, rank}, - If[rank == 0, {}, - (* compute the variable columns of the linear combinations *) - Assert[numAxes == Dimensions[V][[1]]]; - numDataRecs = dataRecs[[All, numAxes]].V; - A - If[preStratifyQ, - - numAvcs = Map[AVC[Stratify[numDataRecs[[All, #]], nStrata], classLabels] &, Range[rank]]; - - numRes = - Table[Append[ - AVCFindBestSplitValue[numAvcs[[i]], Number, 0, - impFunc], {numAxes, V[[All, i]]}], {i, rank}], - (* ELSE *) - - PRINT["AVCSplitSelection:: Dimensions[numDataRecs]=", Dimensions[numDataRecs]]; - - numAvcs = Map[AVC[numDataRecs[[All, #]], classLabels] &, Range[rank]]; - - PRINT["AVCSplitSelection:: Length/@numAvcs = ", Length /@ numAvcs]; - - numRes = - Table[Append[ - AVCFindBestSplitValue[numAvcs[[i]], Number, nStrata, - impFunc], {numAxes, V[[All, i]]}], {i, rank}] - ]]], - {{V}, {Dimensions[V][[2]]}}]; + rank = Dimensions[V][[2]]; + If[rank == 0, {}, + (* compute the variable columns of the linear combinations *) + Assert[numAxes == Dimensions[V][[1]]]; + numDataRecs = dataRecs[[All, numAxes]].V; + If[preStratifyQ, + numAvcs = Map[AVC[Stratify[numDataRecs[[All, #]], nStrata], classLabels] &, Range[rank]]; + numRes = Table[Append[AVCFindBestSplitValue[numAvcs[[i]], Number, 0, impFunc], {numAxes, V[[All, i]]}], {i, rank}], + (* ELSE *) + PRINT["AVCSplitSelection:: Dimensions[numDataRecs]=", Dimensions[numDataRecs]]; + numAvcs = Map[AVC[numDataRecs[[All, #]], classLabels] &, Range[rank]]; + PRINT["AVCSplitSelection:: Length/@numAvcs = ", Length /@ numAvcs]; + numRes = Table[Append[AVCFindBestSplitValue[numAvcs[[i]], Number, nStrata, impFunc], {numAxes, V[[All, i]]}], {i, rank}] + ] + ]; ]; ]; ]; - Join[numRes] + numRes ]; Clear[AVCSplitSelection]