Commit 67d3625e authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Minor changes changes to naming, code formatting, and add doxygen comments.... 

Minor changes changes to naming, code formatting, and add doxygen comments. This also removes unneeded namespace qualifiers and fixes a missing header file in the precompilered header list.
parent 2c12cab4

graph_framework/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ target_precompile_headers (rays 
                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/arithmetic.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/backend.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/dispersion.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/absorption.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/math.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/node.hpp>>

                           $<$<BOOL:${USE_PCH}>:$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/solver.hpp>>

graph_framework/absorption.hpp

+3 −2
Original line number Diff line number Diff line 
//------------------------------------------------------------------------------

///  @file absoprtion.hpp

///  @brief Base class for a dispersion relation.

///  @file absorption.hpp

///  @brief Base class for an absorption model.

///

///  Defines functions for computing power absorbtion.

//------------------------------------------------------------------------------
@@ -11,6 +11,7 @@ 
#include <thread>



#include "newton.hpp"

#include "output.hpp"



namespace absorption {

//******************************************************************************

graph_framework/arithmetic.hpp

+28 −28
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef arithmetic_h

#define arithmetic_h



#include "trigonometry.hpp"

#include "node.hpp"



namespace graph {

//------------------------------------------------------------------------------
@@ -741,12 +741,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -1563,12 +1563,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -1822,8 +1822,8 @@ namespace graph { 
            }



//  Move trig to the right.

            auto cl = graph::cos_cast(this->left);

            auto sl = graph::sin_cast(this->left);

            auto cl = cos_cast(this->left);

            auto sl = sin_cast(this->left);

            if ((cl.get() && !this->right->is_power_like() &&

                 !this->right->is_all_variables() &&

                 !sin_cast(this->right).get()) ||
@@ -2455,12 +2455,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -3406,12 +3406,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -4837,12 +4837,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)

graph_framework/math.hpp

+25 −25
Original line number Diff line number Diff line
@@ -279,12 +279,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -546,12 +546,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -786,12 +786,12 @@ namespace graph { 
        auto temp = std::make_shared<log_node<T, SAFE_MATH>> (x)->reduce();

//  Test for hash collisions.

        for (size_t i = temp->get_hash(); i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -1289,12 +1289,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -1554,12 +1554,12 @@ namespace graph { 
//  Test for hash collisions.

        for (size_t i = temp->get_hash();

             i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)

graph_framework/node.hpp

+20 −12
Original line number Diff line number Diff line
@@ -312,12 +312,20 @@ namespace graph { 
        }



// Create one struct that holds both caches: for constructed nodes and for the backend buffers

//------------------------------------------------------------------------------

///  @brief Data structure to contain the two caches.

///

///  This a avoids an issue on gnu compilers where it would try to redefine the

///  __tls_guard twice depending on the include order.

//------------------------------------------------------------------------------

        struct caches_t {

        std::map<size_t, std::shared_ptr<leaf_node<T, SAFE_MATH>>> main_cache;

        std::map<size_t, backend::buffer<T>> backend_cache;

///  Cache of node.

            std::map<size_t, std::shared_ptr<leaf_node<T, SAFE_MATH>>> nodes;

///  Cache of backend buffers.

            std::map<size_t, backend::buffer<T>> backends;

        };



// We define only one inline static thread_local variable

///  A per thread instance of the cache structure.

        inline static thread_local caches_t caches;



///  Type def to retrieve the backend type.
@@ -595,12 +603,12 @@ namespace graph { 
        auto temp = std::make_shared<constant_node<T, SAFE_MATH>> (d);

//  Test for hash collisions.

        for (size_t i = temp->get_hash(); i < std::numeric_limits<size_t>::max(); i++) {

            if (leaf_node<T, SAFE_MATH>::caches.main_cache.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.main_cache.end()) {

                leaf_node<T, SAFE_MATH>::caches.main_cache[i] = temp;

            if (leaf_node<T, SAFE_MATH>::caches.nodes.find(i) ==

                leaf_node<T, SAFE_MATH>::caches.nodes.end()) {

                leaf_node<T, SAFE_MATH>::caches.nodes[i] = temp;

                return temp;

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.main_cache[i])) {

                return leaf_node<T, SAFE_MATH>::caches.main_cache[i];

            } else if (temp->is_match(leaf_node<T, SAFE_MATH>::caches.nodes[i])) {

                return leaf_node<T, SAFE_MATH>::caches.nodes[i];

            }

        }

#if defined(__clang__) || defined(__GNUC__)
@@ -1370,7 +1378,7 @@ namespace graph { 
    using input_nodes = std::vector<shared_variable<T, SAFE_MATH>>;

///  Convenience type alias for maping end codes back to inputs.

    template<jit::float_scalar T, bool SAFE_MATH=false>

    using map_nodes = std::vector<std::pair<graph::shared_leaf<T, SAFE_MATH>,

    using map_nodes = std::vector<std::pair<shared_leaf<T, SAFE_MATH>,

                                            shared_variable<T, SAFE_MATH>>>;



//------------------------------------------------------------------------------