Skip to content

Move PowerSystemsData.hpp and CircuitGraph.hpp to correct subdirectories #114

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

Merged
merged 5 commits into from
May 27, 2025
Merged

Move PowerSystemsData.hpp and CircuitGraph.hpp to correct subdirectories #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8ac748
Mowe PowerSystemsData.hpp to src/Models/PowerFlow.
pelesh May 26, 2025
884c8e3
Move CircuitGraph.hpp to Model/PowerElectronics
pelesh May 26, 2025
5d2973b
Apply pre-commmit fixes
pelesh May 26, 2025
5b1f174
Moving Matpower parser to src/Model/PowerFlow
pelesh May 27, 2025
89d7d75
Apply pre-commmit fixes
pelesh May 27, 2025
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
4 changes: 2 additions & 2 deletions examples/PowerFlow/Grid3Bus/Grid3BusSys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
#include <Model/PowerFlow/Bus/BusFactory.hpp>
#include <Model/PowerFlow/Generator/GeneratorFactory.hpp>
#include <Model/PowerFlow/Load/Load.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/MiniGrid/MiniGrid.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>
#include <Model/PowerFlow/SystemModelPowerFlow.hpp>
#include <PowerSystemData.hpp>
#include <Solver/SteadyState/Kinsol.hpp>
#include <Utilities/FileIO.hpp>
#include <Utilities/Testing.hpp>

static const std::string BUS3_DATA_STRING = R"(
Expand Down
2 changes: 1 addition & 1 deletion examples/PowerFlow/MatPowerTesting/MatPowerTesting.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include <limits>
#include <vector>

#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>
#include <Utilities/Testing.hpp>

namespace
Expand Down
4 changes: 2 additions & 2 deletions examples/PowerFlow/MatPowerTesting/test_parse_branch_row.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <iostream>

#include "MatPowerTesting.hpp"
#include <FileIO.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

using namespace GridKit;
using namespace GridKit::Testing;
Expand Down
4 changes: 2 additions & 2 deletions examples/PowerFlow/MatPowerTesting/test_parse_bus_row.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <iostream>

#include "MatPowerTesting.hpp"
#include <FileIO.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

using namespace GridKit;
using namespace GridKit::Testing;
Expand Down
4 changes: 2 additions & 2 deletions examples/PowerFlow/MatPowerTesting/test_parse_gen_row.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <iostream>

#include "MatPowerTesting.hpp"
#include <FileIO.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

using namespace GridKit;
using namespace GridKit::Testing;
Expand Down
4 changes: 2 additions & 2 deletions examples/PowerFlow/MatPowerTesting/test_parse_gencost_row.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <iostream>

#include "MatPowerTesting.hpp"
#include <FileIO.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

using namespace GridKit;
using namespace GridKit::Testing;
Expand Down
4 changes: 2 additions & 2 deletions examples/PowerFlow/MatPowerTesting/test_parse_matpower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <iostream>

#include "MatPowerTesting.hpp"
#include <FileIO.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/MatpowerParser.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

using namespace GridKit;
using namespace GridKit::Testing;
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PhasorDynamics/Branch/Branch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <iostream>

#include <Model/PhasorDynamics/Bus/Bus.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PhasorDynamics/Bus/Bus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <cmath>
#include <iostream>

#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PhasorDynamics/Bus/BusInfinite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <cmath>
#include <iostream>

#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PhasorDynamics/BusFault/BusFault.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <iostream>

#include <Model/PhasorDynamics/Bus/Bus.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PhasorDynamics/Load/Load.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <iostream>

#include <Model/PhasorDynamics/Bus/Bus.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/Capacitor/Capacitor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _CAP_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/CircuitComponent.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <set>

#include <Model/Evaluator.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
0 src/CircuitGraph.hpp → src/Model/PowerElectronics/CircuitGraph.hpp
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/DistributedGenerator/DistributedGenerator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _CAP_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/InductionMotor/InductionMotor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _IMOTOR_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/Inductor/Inductor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _IND_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/LinearTransformer/LinearTransformer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _LTRANS_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/MicrogridBusDQ/MicrogridBusDQ.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _VIRBUSDQ_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/MicrogridLine/MicrogridLine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _TRANLINE_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/MicrogridLoad/MicrogridLoad.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _TRANLOAD_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/Resistor/Resistor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _RES_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/SynchronousMachine/SynchronousMachine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <tuple>

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerElectronics/SystemModelPowerElectronics.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <iostream>
#include <vector>

#include <CircuitGraph.hpp>
#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <Model/PowerElectronics/CircuitGraph.hpp>
#include <ScalarTraits.hpp>

namespace GridKit
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/TransmissionLine/TransmissionLine.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _TRANLINE_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
1 change: 0 additions & 1 deletion src/Model/PowerElectronics/VoltageSource/VoltageSource.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#define _VOSO_HPP_

#include <Model/PowerElectronics/CircuitComponent.hpp>
#include <PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Branch/Branch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <iostream>

#include <Model/PowerFlow/Bus/BaseBus.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Bus/BusFactory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <Model/PowerFlow/Bus/BusPQ.hpp>
#include <Model/PowerFlow/Bus/BusPV.hpp>
#include <Model/PowerFlow/Bus/BusSlack.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Bus/BusPQ.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define _BUS_PQ_HPP_

#include "BaseBus.hpp"
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Bus/BusPV.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <cassert>

#include "BaseBus.hpp"
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Bus/BusSlack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define _BUS_SLACK_HPP_

#include "BaseBus.hpp"
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Generator/GeneratorFactory.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <Model/PowerFlow/Generator/GeneratorPQ.hpp>
#include <Model/PowerFlow/Generator/GeneratorPV.hpp>
#include <Model/PowerFlow/Generator/GeneratorSlack.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Generator/GeneratorPQ.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "GeneratorBase.hpp"
#include <Model/PowerFlow/ModelEvaluatorImpl.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Generator/GeneratorPV.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "GeneratorBase.hpp"
#include <Model/PowerFlow/ModelEvaluatorImpl.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
3 changes: 1 addition & 2 deletions src/Model/PowerFlow/Generator/GeneratorSlack.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@

#pragma once

// #include <Model/PowerFlow/ModelEvaluatorImpl.hpp>
#include <vector>

#include "GeneratorBase.hpp"
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
2 changes: 1 addition & 1 deletion src/Model/PowerFlow/Load/Load.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define _LOAD_HPP_

#include <Model/PowerFlow/ModelEvaluatorImpl.hpp>
#include <PowerSystemData.hpp>
#include <Model/PowerFlow/PowerSystemData.hpp>

namespace GridKit
{
Expand Down
Loading