Commit 1d5ca448 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Remove left over macros to diaable the row column constant reduction.

parent 08e7e108

graph_framework/arithmetic.hpp

+0 −8
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -225,7 +224,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



//  Idenity reductions.

            if (this->left->is_match(this->right)) {
@@ -710,7 +708,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -741,7 +738,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



//  Common factor reduction. If the left and right are both muliply nodes check

//  for a common factor. So you can change a*b - a*c -> a*(b - c).
@@ -1306,7 +1302,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -1337,7 +1332,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



//  Move constants to the left.

            if (is_constant_promotable(this->right, this->left)) {
@@ -2091,7 +2085,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -2122,7 +2115,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



            if (this->left->is_match(this->right)) {

                return one<T, SAFE_MATH> ();

graph_framework/math.hpp

+0 −2
Original line number Diff line number Diff line
@@ -898,7 +898,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -929,7 +928,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



            auto lp = pow_cast(this->left);

//  Only run this reduction if the right is an integer constant value.

graph_framework/trigonometry.hpp

+0 −2
Original line number Diff line number Diff line
@@ -601,7 +601,6 @@ namespace graph { 
                                    pr2->get_right());

            }



#if 1

//  Combine 2D and 1D piecewise constants if a row or column matches.

            if (pr2.get() && pr2->is_row_match(this->left)) {

                backend::buffer<T> result = pl1->evaluate();
@@ -632,7 +631,6 @@ namespace graph { 
                                    pl2->get_left(),

                                    pl2->get_right());

            }

#endif



            return this->shared_from_this();

        }