Skip to content

Commit 65667d8

Browse files
update to latest version
1 parent 6833e06 commit 65667d8

File tree

69 files changed

+9693
-3532
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+9693
-3532
lines changed

exe/codegen_cli_main.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ along with LB-LMC Solver C++ Code Generation Library. If not, see <https://www.
2323
/**
2424
@ file main file for CLI application for LB-LMC solver code generator
2525
@author Matthew Milton
26-
@date 2019
26+
@date 2019-2020
2727
**/
2828

2929
#include <iostream>
@@ -33,7 +33,7 @@ along with LB-LMC Solver C++ Code Generation Library. If not, see <https://www.
3333
#include "codegen/netlist/Netlist.hpp"
3434
#include "codegen/netlist/NetlistLoader.hpp"
3535
#include "codegen/netlist/ComponentFactory.hpp"
36-
#include "codegen/SimulationEngineGenerator.hpp"
36+
#include "codegen/SolverEngineGenerator.hpp"
3737

3838
#define STRINGFY(x) #x
3939
#define TOSTRING(x) STRINGFY(x)
@@ -42,7 +42,7 @@ const static std::string PROGRAM_TITLE =
4242
"ORTiS Solver C++ Code Generator";
4343

4444
const static std::string PROGRAM_VERSION =
45-
"Version: " TOSTRING(VERSION) //VERSION defined outside of code (-D argument of gcc tools)
45+
"Built: " __DATE__ " " __TIME__
4646
;
4747

4848
const static std::string COPYRIGHT =
@@ -116,10 +116,10 @@ ORTiS Solver C++ Code Generator uses Eigen 3 Linear Algebra C++ Template Library
116116
Acknowledgements:
117117
118118
Matthew Milton -- ORTiS Code Generation Library and Tool Creator, Lead Developer and Director
119-
Andrea Benigni -- Original LB-LMC Solver Algorithm Creator
120119
Michele Difronzo -- Component Model Developer, Software Tester, Feature Requester
121120
Mark Vygoder -- Component Model Developer, Software Tester, Feature Requester
122121
Dhiman Chowdhury -- Component Model Developer
122+
Andrea Benigni -- Original LB-LMC Solver Algorithm Creator
123123
124124
)";
125125

@@ -179,8 +179,8 @@ int main(int argc, char* argv[])
179179

180180
std::vector< ComponentFactory::ComponentPtr > component_generators;
181181

182-
SimulationEngineGenerator seg(model_name, num_solutions);
183-
SimulationEngineGeneratorParameters seg_params;
182+
SolverEngineGenerator seg(model_name, num_solutions);
183+
SolverEngineGeneratorParameters seg_params;
184184
seg_params.codegen_solver_templated_function_enable = true;
185185
seg_params.codegen_solver_templated_real_type_enable = true;
186186
seg.setParameters(seg_params);

include/codegen/CodeGenDataTypes.hpp

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,20 @@ along with LB-LMC Solver C++ Code Generation Library. If not, see <https://www.
2121
*/
2222

2323
/**
24-
*
25-
*
26-
* Provides data types to be used only in code generation for LB-LMC engine development
27-
*
28-
* Many of the data types here may not be FPGA/HDL synthesizable
29-
*
30-
* @author Matthew Milton
31-
* @date Spring 2018
32-
*
33-
*/
3424
35-
#ifndef TBDATATYPES_HPP
36-
#define TBDATATYPES_HPP
25+
\file CodeGenDataTypes.hpp
3726
38-
//#include "LBLMC/Params.hpp"
39-
40-
#ifdef LBLMC_XILINX_VIVADO_HLS
41-
#include <ap_int.h>
42-
#include <ap_fixed.h>
43-
#include <hls_half.h>
44-
#endif
27+
Provides data types to be used only in code generation for LB-LMC engine development
28+
29+
Many of the data types here may not be FPGA/HDL synthesizable
30+
31+
\author Matthew Milton
32+
\date Spring 2018
33+
34+
**/
35+
36+
#ifndef LBLMC_CODEGENDATATYPES_HPP
37+
#define LBLMC_CODEGENDATATYPES_HPP
4538

4639
#include <Eigen/Dense>
4740

@@ -64,4 +57,4 @@ VectorRMXd; ///< dynamically-allocated row-major double Eigen3 vector type
6457

6558
} //namespace lblmc
6659

67-
#endif // TBDATATYPES_HPP
60+
#endif // LBLMC_CODEGENDATATYPES_HPP

include/codegen/Cpp.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ namespace lblmc
3333
\brief defines standard C++11/14 features for code generation and validates C++ code
3434
3535
This class provides public string constants for C++ standard keywords and characters/operators
36+
37+
\note This file is not part of standard C++.
3638
**/
3739
class Cpp
3840
{

include/codegen/ResistiveCompanionElements.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ namespace lblmc
2929
/**
3030
\brief Describes a basic resistive companion element for a Component
3131
(current source with parallel conductance (or ideal voltage source) and associated id and name)
32+
3233
\deprecated This class is being phased out in use
3334
**/
3435
class ResistiveCompanionElement

0 commit comments

Comments
 (0)