Skip to content

Rename logs & sqrts to log & sqrt #41

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
mj-xmr merged 1 commit into from
Dec 19, 2021
Merged

Rename logs & sqrts to log & sqrt #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/tsqsim-lib/src/TSXformFactory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ CorPtr<ITSXform> TSXformFactory::Create(const Str & name) const
{
case TSXformType::DIFF: return CorPtr<ITSXform>(new TSXformDiff());
case TSXformType::FABS: return CorPtr<ITSXform>(new TSXformFabs());
case TSXformType::SQRTS: return CorPtr<ITSXform>(new TSXformSqrtSafe());
case TSXformType::LOGS: return CorPtr<ITSXform>(new TSXformLogSafe());
case TSXformType::SQRTS: return CorPtr<ITSXform>(new TSXformSqrt());
case TSXformType::LOGS: return CorPtr<ITSXform>(new TSXformLog());
case TSXformType::ADD: return CorPtr<ITSXform>(new TSXformAdd(params));
case TSXformType::MUL: return CorPtr<ITSXform>(new TSXformMul(params));
case TSXformType::DIV: return CorPtr<ITSXform>(new TSXformDiv(params));
Expand Down
12 changes: 6 additions & 6 deletions src/tsqsim-lib/src/TSXformImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ double TSXformFabs::Invert(const EnjoLib::VecD & vals) const
return vals.at(0);
}

double TSXformSqrtSafe::Run(const TSFunBase & input, int idx, double valPrev) const
double TSXformSqrt::Run(const TSFunBase & input, int idx, double valPrev) const
{
return Run(VecD(1, valPrev));
}
double TSXformSqrtSafe::Run(const EnjoLib::VecD & vals) const
double TSXformSqrt::Run(const EnjoLib::VecD & vals) const
{
const double valPrev = vals.at(0);
const GMat gmat;
Expand All @@ -67,19 +67,19 @@ double TSXformSqrtSafe::Run(const EnjoLib::VecD & vals) const
return -gmat.Sqrt(-valPrev);
}
}
double TSXformSqrtSafe::Invert(const EnjoLib::VecD & vals) const
double TSXformSqrt::Invert(const EnjoLib::VecD & vals) const
{
const double valPrev = vals.at(0);
const GMat gmat;
const double pow = gmat.Pow(valPrev, 2);
return valPrev < 0 ? -pow : pow;
}

double TSXformLogSafe::Run(const TSFunBase & input, int idx, double valPrev) const
double TSXformLog::Run(const TSFunBase & input, int idx, double valPrev) const
{
return Run(VecD(1, valPrev));
}
double TSXformLogSafe::Run(const EnjoLib::VecD & vals) const
double TSXformLog::Run(const EnjoLib::VecD & vals) const
{
const double valPrev = vals.at(0);
const GMat gmat;
Expand All @@ -97,7 +97,7 @@ double TSXformLogSafe::Run(const EnjoLib::VecD & vals) const
return -gmat.Log(diff + VAL_BORDER); /// TODO: Call Log only once (after UTs)
}
}
double TSXformLogSafe::Invert(const EnjoLib::VecD & vals) const
double TSXformLog::Invert(const EnjoLib::VecD & vals) const
{
const double val = vals.at(0);
const GMat gmat;
Expand Down
4 changes: 2 additions & 2 deletions src/tsqsim-lib/src/TSXformImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ struct TSXformFabs : public ITSXform
double Invert(const EnjoLib::VecD & vals) const override;
};

struct TSXformSqrtSafe : public ITSXform
struct TSXformSqrt : public ITSXform
{
double Run(const TSFunBase & input, int idx, double valPrev) const override;
double Run(const EnjoLib::VecD & vals) const override;
double Invert(const EnjoLib::VecD & vals) const override;
};

struct TSXformLogSafe : public ITSXform
struct TSXformLog : public ITSXform
{
double Run(const TSFunBase & input, int idx, double valPrev) const override;
double Run(const EnjoLib::VecD & vals) const override;
Expand Down
4 changes: 2 additions & 2 deletions src/tsqsim-lib/src/TSXformTypeString.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ TSXformTypeString:: TSXformTypeString()
{
case TSXformType::DIFF: Add(i, "diff"); break;
case TSXformType::FABS: Add(i, "fabs"); break;
case TSXformType::SQRTS: Add(i, "sqrts"); break;
case TSXformType::LOGS: Add(i, "logs"); break;
case TSXformType::SQRTS: Add(i, "sqrt"); break;
case TSXformType::LOGS: Add(i, "log"); break;
case TSXformType::ADD: Add(i, "add"); break;
case TSXformType::MUL: Add(i, "mul"); break;
case TSXformType::DIV: Add(i, "div"); break;
Expand Down
6 changes: 3 additions & 3 deletions src/tsqsim/scripts/ts-xform-script.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
diff
#fabs
#sqrt
logs
#sqrts
#logs
log
#sqrt
#log
add 0


2 changes: 1 addition & 1 deletion tests/test-tsqsim/src/TSXformImplTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ TEST(Conv_diffs)
TEST(Conv_fabs)
{
/// TODO: TSXformType::FABS:
}
}