-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
WIP: Implement arbitrary field sequences #14
base: dev
Are you sure you want to change the base?
Conversation
#include "Constant.hpp" | ||
#include "Field.hpp" | ||
#include "Lissajous.hpp" | ||
#include "ModulatedSinc.hpp" | ||
#include "Rectangular.hpp" | ||
#include "Sinc.hpp" | ||
#include "Sinusoidal.hpp" | ||
#include "Triangular.hpp" | ||
#include "Zero.hpp" | ||
|
||
|
||
#ifndef INC_SEQUENCEFIELDS_H | ||
#define INC_SEQUENCEFIELDS_H | ||
template <typename prec> | ||
class ZeroField; | ||
template <typename prec> | ||
class ConstantField; | ||
template <typename prec> | ||
class LissajousField; | ||
template <typename prec> | ||
class RectangularField; | ||
template <typename prec> | ||
class SinusoidalField; | ||
template <typename prec> | ||
class TriangularField; | ||
template <typename prec> | ||
class SincField; | ||
template <typename prec> | ||
class ModulatedSincField; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need the forward definitions and the includes ?
#ifndef INC_SEQUENCEFIELDS_H | ||
#define INC_SEQUENCEFIELDS_H |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this here ?
#ifndef INC_SEQUENCEFieldSelector_H | ||
#define INC_SEQUENCEFieldSelector_H | ||
///--------------------------------------------------------------------------------------------------- | ||
#pragma once |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
????? C&P errors?
#endif // INC_FieldList_H | ||
// end of Fields\FieldList.h |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
comment?
@@ -543,7 +545,7 @@ case Value: \ | |||
protected: | |||
SimulationManager() = default; | |||
public: | |||
STOPHYSIM_EXPORT SimulationManager(const Parameters &SimManSet) | |||
STOPHYSIM_EXPORT SimulationManager(const Settings::SimulationManagerSettings<prec> &SimManSet) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is this changed?
Application SimManager{ std::move(input.getAppParams()) }; | ||
Settings::SimulationManagerSettings<PREC> test{input.getAppParams()}; | ||
Application SimManager{ test }; | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
????
Properties::Fields::Lissajous<PREC> fieldprops{ {},Pos,ampl,freq, phases }; | ||
Properties::Fields::Sequence<PREC> fieldprops2{{},3,fields }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changes in this file necessary ? Or was this just testing?
@@ -111,5 +113,6 @@ namespace SettingsFileGen | |||
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Rectangular>::type) | |||
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Sinc>::type) | |||
SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Modsinc>::type) | |||
//SYSMATFILEGENMAKRO(field_enum_property_mapping<IField::Field_Sequence>::type) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this commented?
@@ -11,6 +11,7 @@ set(H_FILES_Fields Fields/FieldList.h | |||
Fields/RectangularField.h | |||
Fields/SincField.h | |||
Fields/ModulatedSincField.h | |||
Fields/SequenceField.h |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
change to hpp file
Co-authored-by: Alexander Neumann <[email protected]>
Co-authored-by: Alexander Neumann <[email protected]>
@TobiasKlemme: Könntest du bitte ein Issue öffnen mit dem Fehler von dem du mir berichtet hattest und die Configs in das Issue anhängen? Ich hatte lokal versucht den Fehler zu reproduzieren, konnte aber keinen Fehler finden. |
implemented sequence field