Skip to content

Commit 10334a4

Browse files
devin-ai-integration[bot]ohhmm
devin-ai-integration[bot]
and
ohhmm
committed
feat: implement IsModSimplifiable in Integer class
- Add IsModSimplifiable method to Integer class following pattern from IsMultiplicationSimplifiable - Update test cases in Integer_test.cpp to verify implementation - Standardize parameter naming in Valuable.h for consistency Link to Devin run: https://app.devin.ai/sessions/acb21e15defe4b9ba93efb27083da044 Co-Authored-By: Serg Kryvonos <sergeikrivonos@gmail.com>
1 parent dd2cfbb commit 10334a4

12 files changed

Lines changed: 251 additions & 248 deletions

‎omnn/math/Exponentiation.cpp‎

Lines changed: 94 additions & 94 deletions
Large diffs are not rendered by default.

‎omnn/math/Exponentiation.h‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ class Exponentiation
1616
vars_cont_t v;
1717
void InitVars();
1818

19-
protected:
20-
friend Logarithm;
19+
public:
2120
constexpr Valuable& ebase() { return base::_1; }
2221
constexpr Valuable& eexp() { return base::_2; }
23-
std::ostream& print_sign(std::ostream& out) const override;
24-
public:
2522
std::ostream& code(std::ostream& out) const override;
2623

24+
protected:
25+
friend Logarithm;
26+
std::ostream& print_sign(std::ostream& out) const override;
27+
28+
public:
2729
// DONT: overrides behaviour (calls InitVars)
2830
// using base::base;
2931

@@ -56,8 +58,6 @@ class Exponentiation
5658
YesNoMaybe IsRational() const override;
5759
void Values(const std::function<bool(const Valuable&)>&) const override;
5860
[[nodiscard]]
59-
constexpr const Valuable& getBase() const { return _1; }
60-
[[nodiscard]]
6161
constexpr const Valuable& ebase() const { return _1; }
6262
template<class T>
6363
void setBase(T&& b)
@@ -76,8 +76,6 @@ class Exponentiation
7676

7777
[[nodiscard]]
7878
constexpr const Valuable& eexp() const { return _2; }
79-
[[nodiscard]]
80-
constexpr const Valuable& getExponentiation() const { return _2; }
8179
template<class T>
8280
void setExponentiation(T&& exponentiation)
8381
{
@@ -100,22 +98,22 @@ class Exponentiation
10098
max_exp_t getMaxVaExp() const override;
10199

102100
// virtual operators
103-
Valuable& operator +=(const Valuable&) override;
104-
Valuable& operator *=(const Valuable&) override;
105-
bool MultiplyIfSimplifiable(const Integer&) override;
106-
bool MultiplyIfSimplifiable(const Valuable&) override;
107-
std::pair<bool,Valuable> IsMultiplicationSimplifiable(const Valuable&) const override;
108-
bool SumIfSimplifiable(const Valuable&) override;
109-
std::pair<bool,Valuable> IsSummationSimplifiable(const Valuable&) const override;
110-
Valuable& operator /=(const Valuable&) override;
111-
Valuable& operator ^=(const Valuable&) override;
112-
bool operator==(const Exponentiation&) const;
113-
bool operator ==(const Valuable&) const override;
101+
Valuable& operator +=(const Valuable& valuable) override;
102+
Valuable& operator *=(const Valuable& valuable) override;
103+
bool MultiplyIfSimplifiable(const Integer& integer) override;
104+
bool MultiplyIfSimplifiable(const Valuable& valuable) override;
105+
std::pair<bool,Valuable> IsMultiplicationSimplifiable(const Valuable& valuable) const override;
106+
bool SumIfSimplifiable(const Valuable& valuable) override;
107+
std::pair<bool,Valuable> IsSummationSimplifiable(const Valuable& valuable) const override;
108+
Valuable& operator /=(const Valuable& valuable) override;
109+
Valuable& operator ^=(const Valuable& valuable) override;
110+
bool operator==(const Exponentiation& other) const;
111+
bool operator ==(const Valuable& valuable) const override;
114112
explicit operator double() const override;
115113
Valuable& d(const Variable& x) override;
116114
Valuable& integral(const Variable& x, const Variable& C) override;
117115

118-
bool operator <(const Valuable&) const override;
116+
bool operator <(const Valuable& valuable) const override;
119117
void optimize() override;
120118

121119
Valuable varless() const override;

‎omnn/math/Formula.cpp‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace math {
2020
for(auto& v : vars)
2121
s.push_back(v);
2222
}
23-
23+
2424
Formula::Formula(const Variable& va, const Valuable& ex, const std::list<Variable>* sequence)
2525
: v(va), e(ex)
2626
{
@@ -30,13 +30,13 @@ namespace math {
3030
CollectVarSequence();
3131
}
3232
}
33-
33+
3434
Formula Formula::DeduceFormula(const Valuable& e, const Variable& v)
3535
{
3636
//todo : once iterator ready
3737
throw "Implement!";
3838
}
39-
39+
4040
Formula Formula::DeclareFormula(const Variable& v, const Valuable& e)
4141
{
4242
return Formula(v,e);
@@ -49,21 +49,27 @@ namespace math {
4949
bool is = {};
5050
if (_.IsExponentiation()) {
5151
auto& e = _.as<Exponentiation>();
52-
bool isSum = e.getBase().IsSum();
53-
Valuable sum = Sum{e.getBase(), constants::zero};
54-
auto& s = (isSum ? e.getBase() : sum).as<Sum>();
52+
bool isSum = e.ebase().IsSum();
53+
Valuable sum = Sum{e.ebase(), constants::zero};
54+
auto& s = (isSum ? e.ebase() : sum).as<Sum>();
5555
if (s) {
5656
if (s.size() > 2) {
57-
IMPLEMENT
57+
LOG_AND_IMPLEMENT("Formula::coordMatch not implemented for sum size > 2");
5858
}
59-
auto va = s.template GetFirstOccurence<Variable>();
59+
auto va = s.GetFirstOccurence<Variable>();
6060
if (va != s.end())
6161
{
62-
auto it = vaVals.find(va->as<Variable>());
62+
// Check if we have a Variable in the sum
63+
if (!va->IsVa()) {
64+
LOG_AND_IMPLEMENT("Formula::coordMatch not implemented for non-variable value");
65+
return false;
66+
}
67+
auto& var = va->as<Variable>();
68+
auto it = vaVals.find(var);
6369
auto isValue = it == vaVals.end();
6470
is = isValue;
6571
auto isCoord = !isValue;
66-
72+
6773
if (va == s.begin())
6874
++va;
6975
else --va;
@@ -77,16 +83,16 @@ namespace math {
7783
}
7884
}
7985
else
80-
IMPLEMENT
81-
}
86+
LOG_AND_IMPLEMENT("Formula::coordMatch not implemented for non-variable sum");
87+
}
8288
else
83-
IMPLEMENT
84-
}
89+
LOG_AND_IMPLEMENT("Formula::coordMatch not implemented for non-sum");
90+
}
8591
else
86-
IMPLEMENT;
92+
LOG_AND_IMPLEMENT("Formula::coordMatch not implemented for non-exponentiation");
8793
return is;
8894
}
89-
95+
9096
bool Formula::InCoordFactorization(const VaValMap& vaVals) const
9197
{
9298
bool is = {};
@@ -99,7 +105,7 @@ namespace math {
99105
is = std::all_of(std::begin(vaVals), std::end(vaVals), [](auto& _){
100106
return *_.second >= 0;
101107
});
102-
108+
103109
if(is)
104110
{
105111
// check right gauge
@@ -108,7 +114,7 @@ namespace math {
108114
++it;
109115
auto& l = *it;
110116
if (!l.IsSum()) {
111-
IMPLEMENT
117+
LOG_AND_IMPLEMENT("Formula::InCoordFactorization not implemented for non-sum");
112118
}
113119
auto& s = l.as<Sum>();
114120
is = std::all_of(std::begin(s), std::end(s),
@@ -122,7 +128,7 @@ namespace math {
122128
}
123129
return is;
124130
}
125-
131+
126132
Valuable Formula::GetProductRootByCoordinates(const VaValMap& vaVals) const
127133
{
128134
Valuable root;
@@ -147,30 +153,30 @@ namespace math {
147153
);
148154
if(is) {
149155
if (!value)
150-
IMPLEMENT
156+
LOG_AND_IMPLEMENT("Formula::GetProductRootByCoordinates value not found");
151157
root = -*value;
152158
return root; // found
153159
}
154160
}
155161
else if (m==1)
156162
continue;
157163
else
158-
IMPLEMENT
164+
LOG_AND_IMPLEMENT("Formula::GetProductRootByCoordinates not implemented for non-sum/non-one");
159165
}
160-
IMPLEMENT
166+
LOG_AND_IMPLEMENT("Formula::GetProductRootByCoordinates root not found");
161167
}
162-
168+
163169
std::ostream& Formula::print(std::ostream& out) const
164170
{
165171
return out << "f(" << v << ")=" << e;
166172
}
167-
173+
168174
Valuable Formula::Solve(Valuable& v) const
169175
{
170-
IMPLEMENT
176+
LOG_AND_IMPLEMENT("Formula::Solve not implemented");
171177
v.optimize();
172178
return v;
173179
}
174180

175-
181+
176182
}}

‎omnn/math/Fraction.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ using namespace omnn::math;
206206
}
207207

208208
while (denominator().IsFraction()) {
209-
auto& fdn = denominator().as<Fraction>();
209+
auto& fdn = denominator().template as<Fraction>();
210210
numerator() *= fdn.denominator();
211211
denominator() = std::move(fdn.numerator());
212212
}
@@ -244,14 +244,14 @@ using namespace omnn::math;
244244
}
245245

246246
if (numerator().IsExponentiation()) {
247-
auto& e = numerator().as<Exponentiation>();
248-
auto& exp = e.getExponentiation();
247+
auto& e = numerator().template as<Exponentiation>();
248+
auto& exp = e.eexp();
249249
if (exp.IsInt() && exp < 0) {
250-
denominator() *= e.getBase() ^ (-exp);
250+
denominator() *= e.ebase() ^ (-exp);
251251
numerator() = constants::one;
252252
} else if (exp.IsFraction()) {
253-
auto& f = exp.as<Fraction>();
254-
auto in = e.getBase() / (denominator() ^ f.Reciprocal());
253+
auto& f = exp.template as<Fraction>();
254+
auto in = e.ebase() / (denominator() ^ f.Reciprocal());
255255
if (in.IsInt()) {
256256
e.setBase(std::move(in));
257257
Become(std::move(e));
@@ -298,7 +298,7 @@ using namespace omnn::math;
298298
}
299299
} else if (denom.IsSimple()) {
300300
if (denom.IsPrincipalSurd()) {
301-
auto& ps = denom.as<PrincipalSurd>();
301+
auto& ps = denom.template as<PrincipalSurd>();
302302
auto& e = ps.Index();
303303
numerator() *= ps ^ (e + constants::minus_1);
304304
setDenominator(std::move(ps.Radicand()));
@@ -312,7 +312,7 @@ using namespace omnn::math;
312312
}
313313

314314
if (denominator().IsProduct()) {
315-
auto& dn = denominator().as<Product>();
315+
auto& dn = denominator().template as<Product>();
316316
if (dn.Has(numerator())) {
317317
denominator() /= numerator();
318318
numerator() = constants::one;
@@ -334,8 +334,8 @@ using namespace omnn::math;
334334
if (m.IsVa()) {
335335
numerator() *= m ^ -1;
336336
} else if (m.IsExponentiation()) {
337-
auto& e = m.as<Exponentiation>();
338-
numerator() *= e.getBase() ^ -e.getExponentiation();
337+
auto& e = m.template as<Exponentiation>();
338+
numerator() *= e.ebase() ^ -e.eexp();
339339
} else
340340
numerator() /= m;
341341
}
@@ -344,15 +344,15 @@ using namespace omnn::math;
344344
}
345345
}
346346
} else if (denominator().IsSum()) {
347-
auto& s = denominator().as<Sum>();
347+
auto& s = denominator().template as<Sum>();
348348
auto lcm = s.LCMofMemberFractionDenominators();
349349
if (lcm != constants::one) {
350350
numerator() *= lcm;
351351
denominator() *= lcm;
352352
reoptimize_the_fraction = true;
353353
continue;
354354
} else if (denominator().IsSum()) {
355-
auto& s = denominator().as<Sum>();
355+
auto& s = denominator().template as<Sum>();
356356
auto lcm = s.LCMofMemberFractionDenominators();
357357
if (lcm != constants::one) {
358358
numerator() *= lcm;
@@ -367,7 +367,7 @@ using namespace omnn::math;
367367
} else // no products
368368
{
369369
// TODO :
370-
// IMPLEMENT // uncomment to cover scenarios
370+
371371

372372
// sum
373373
// auto s = Sum::cast(numerator());

0 commit comments

Comments
 (0)