Skip to content
This repository was archived by the owner on Nov 3, 2022. It is now read-only.

Commit d99115c

Browse files
author
Dilawar Singh
committed
Ok. Vector and numpy are working.
1 parent 2f3bc04 commit d99115c

File tree

6 files changed

+203
-217
lines changed

6 files changed

+203
-217
lines changed

basecode/OpFuncBase.cpp

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,54 @@ const unsigned char MooseGetVecHop = 5;
1717
const unsigned char MooseReturnHop = 8;
1818
const unsigned char MooseTestHop = 255;
1919

20-
vector< OpFunc* >& OpFunc::ops()
20+
vector<OpFunc*>& OpFunc::ops()
2121
{
22-
static vector< OpFunc* > op;
23-
return op;
22+
static vector<OpFunc*> op;
23+
return op;
2424
}
2525

2626
OpFunc::OpFunc()
2727
{
28-
opIndex_ = ops().size();
29-
ops().push_back( this );
28+
opIndex_ = ops().size();
29+
ops().push_back(this);
3030
}
3131

32-
const OpFunc* OpFunc0Base::makeHopFunc( HopIndex hopIndex ) const
32+
const OpFunc* OpFunc0Base::makeHopFunc(HopIndex hopIndex) const
3333
{
34-
return new HopFunc0( hopIndex );
34+
return new HopFunc0(hopIndex);
3535
}
3636

37-
void OpFunc0Base::opBuffer( const Eref& e, double* buf ) const
37+
void OpFunc0Base::opBuffer(const Eref& e, double* buf) const
3838
{
39-
op( e );
39+
op(e);
4040
}
4141

42-
const OpFunc* OpFunc::lookop( unsigned int opIndex )
42+
const OpFunc* OpFunc::lookop(unsigned int opIndex)
4343
{
44-
assert ( opIndex < ops().size() );
45-
return ops()[ opIndex ];
44+
assert(opIndex < ops().size());
45+
return ops()[opIndex];
4646
}
4747

4848
// Static function
4949
unsigned int OpFunc::rebuildOpIndex()
5050
{
51-
for( vector< OpFunc* >::iterator
52-
i = ops().begin(); i != ops().end(); ++i ) {
53-
(*i)->opIndex_ = ~0U;
54-
}
55-
return ops().size();
51+
for (vector<OpFunc*>::iterator i = ops().begin(); i != ops().end(); ++i) {
52+
(*i)->opIndex_ = ~0U;
53+
}
54+
return ops().size();
5655
}
5756

58-
bool OpFunc::setIndex( unsigned int i ) // Should only be called by Cinfo.
57+
bool OpFunc::setIndex(unsigned int i) // Should only be called by Cinfo.
5958
{
60-
if( opIndex_ == ~0U ) {
61-
opIndex_ = i;
62-
ops()[i] = this;
63-
return true;
64-
}
65-
/*
66-
cout << " OpFunc " << rttiType() <<
67-
" already setup. (old,new) index = (" <<
68-
opIndex_ << ", " << i << " )\n";
69-
*/
70-
return false;
59+
if (opIndex_ == ~0U) {
60+
opIndex_ = i;
61+
ops()[i] = this;
62+
return true;
63+
}
64+
#if 0 /* ----- #if 0 : If0Label_1 ----- */
65+
cout << " OpFunc " << rttiType() <<
66+
" already setup. (old,new) index = (" <<
67+
opIndex_ << ", " << i << " )\n";
68+
#endif /* ----- #if 0 : If0Label_1 ----- */
69+
return false;
7170
}

0 commit comments

Comments
 (0)