Skip to content

Commit a067d1b

Browse files
maglandmagland
committed
format code and extract templates
1 parent 51490a9 commit a067d1b

File tree

14 files changed

+246
-203
lines changed

14 files changed

+246
-203
lines changed

‎mlcommon/include/mda/diskreadmda.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class DiskReadMda {
2323
DiskReadMda(const DiskReadMda& other); ///Copy constructor
2424
DiskReadMda(const Mda& X); ///Constructor based on an in-memory array. This enables passing an Mda into a function that expects a DiskReadMda.
2525
DiskReadMda(const QJsonObject& prv_object);
26-
DiskReadMda(int concat_dimension,const QList<DiskReadMda> &arrays); //concatenation of arrays. For now concat_dimension must be 2
27-
DiskReadMda(int concat_dimension,const QStringList &array_paths); //concatenation of arrays. For now concat_dimension must be 2
26+
DiskReadMda(int concat_dimension, const QList<DiskReadMda>& arrays); //concatenation of arrays. For now concat_dimension must be 2
27+
DiskReadMda(int concat_dimension, const QStringList& array_paths); //concatenation of arrays. For now concat_dimension must be 2
2828
virtual ~DiskReadMda();
2929
void operator=(const DiskReadMda& other);
3030

3131
///Set the path (file name) of the .mda file to read.
3232
void setPath(const QString& file_path);
3333
void setPrvObject(const QJsonObject& prv_object);
34-
void setConcatPaths(int concat_dimension,const QStringList &paths);
34+
void setConcatPaths(int concat_dimension, const QStringList& paths);
3535

3636
QString makePath() const; //not capturing the reshaping
3737
QJsonObject toPrvObject() const;

‎mlcommon/include/mda/diskreadmda32.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ class DiskReadMda32 {
2323
DiskReadMda32(const DiskReadMda32& other); ///Copy constructor
2424
DiskReadMda32(const Mda32& X); ///Constructor based on an in-memory array. This enables passing an Mda32 into a function that expects a DiskReadMda32.
2525
DiskReadMda32(const QJsonObject& prv_object);
26-
DiskReadMda32(int concat_dimension,const QList<DiskReadMda32> &arrays); //concatenation of arrays. For now concat_dimension must be 2
27-
DiskReadMda32(int concat_dimension,const QStringList &array_paths); //concatenation of arrays. For now concat_dimension must be 2
26+
DiskReadMda32(int concat_dimension, const QList<DiskReadMda32>& arrays); //concatenation of arrays. For now concat_dimension must be 2
27+
DiskReadMda32(int concat_dimension, const QStringList& array_paths); //concatenation of arrays. For now concat_dimension must be 2
2828
virtual ~DiskReadMda32();
2929
void operator=(const DiskReadMda32& other);
3030

3131
///Set the path (file name) of the .mda file to read.
3232
void setPath(const QString& file_path);
3333
void setPrvObject(const QJsonObject& prv_object);
34-
void setConcatPaths(int concat_dimension,const QStringList &paths);
34+
void setConcatPaths(int concat_dimension, const QStringList& paths);
3535

3636
QString makePath() const; //not capturing the reshaping
3737
QJsonObject toPrvObject() const;

‎mlcommon/src/mda/diskreadmda.cpp‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ class DiskReadMdaPrivate {
3030
Mda m_internal_chunk;
3131
long m_current_internal_chunk_index;
3232
Mda m_memory_mda;
33-
bool m_use_memory_mda=false;
34-
bool m_use_concat=false;
35-
int m_concat_dimension=2;
33+
bool m_use_memory_mda = false;
34+
bool m_use_concat = false;
35+
int m_concat_dimension = 2;
3636
QList<DiskReadMda> m_concat_list;
3737

3838
QString m_path;
@@ -97,19 +97,19 @@ DiskReadMda::DiskReadMda(const QJsonObject& prv_object)
9797
this->setPrvObject(prv_object); //important to do this anyway (even if resolve fails) so we can retrieve it later with toPrvObject()
9898
//QString path0 = resolve_prv_object(prv_object, allow_downloads, allow_processing);
9999
if (prv_object.value("use_concat").toBool()) {
100-
QJsonArray concat_list=prv_object["concat_list"].toArray();
101-
int concat_dimension=prv_object["concat_dimension"].toInt();
100+
QJsonArray concat_list = prv_object["concat_list"].toArray();
101+
int concat_dimension = prv_object["concat_dimension"].toInt();
102102
QStringList paths;
103-
for (int i=0; i<concat_list.count(); i++) {
104-
QJsonObject prv_object0=concat_list[i].toObject();
105-
QString path0=locate_prv(prv_object0);
103+
for (int i = 0; i < concat_list.count(); i++) {
104+
QJsonObject prv_object0 = concat_list[i].toObject();
105+
QString path0 = locate_prv(prv_object0);
106106
if (path0.isEmpty()) {
107107
qWarning() << "Unable to construct DiskReadMda from prv_object list. Unable to resolve. Original path = " << prv_object0["original_path"].toString();
108108
return;
109109
}
110110
paths << path0;
111111
}
112-
this->setConcatPaths(concat_dimension,paths);
112+
this->setConcatPaths(concat_dimension, paths);
113113
}
114114
else {
115115
QString path0 = locate_prv(prv_object);
@@ -121,45 +121,45 @@ DiskReadMda::DiskReadMda(const QJsonObject& prv_object)
121121
}
122122
}
123123

124-
DiskReadMda::DiskReadMda(int concat_dimension, const QList<DiskReadMda> &arrays)
124+
DiskReadMda::DiskReadMda(int concat_dimension, const QList<DiskReadMda>& arrays)
125125
{
126126
d = new DiskReadMdaPrivate;
127127
d->q = this;
128128
d->construct_and_clear();
129129

130-
if (concat_dimension!=2) {
130+
if (concat_dimension != 2) {
131131
qCritical() << "For now concat_dimension must be 2!";
132132
return;
133133
}
134134

135-
d->m_use_concat=true;
136-
d->m_concat_dimension=concat_dimension;
137-
d->m_concat_list=arrays;
135+
d->m_use_concat = true;
136+
d->m_concat_dimension = concat_dimension;
137+
d->m_concat_list = arrays;
138138
}
139139

140-
DiskReadMda::DiskReadMda(int concat_dimension, const QStringList &array_paths)
140+
DiskReadMda::DiskReadMda(int concat_dimension, const QStringList& array_paths)
141141
{
142142
d = new DiskReadMdaPrivate;
143143
d->q = this;
144144
d->construct_and_clear();
145145

146-
if (array_paths.count()==1) {
146+
if (array_paths.count() == 1) {
147147
this->setPath(array_paths[0]);
148148
return;
149149
}
150150
QList<DiskReadMda> arrays;
151-
foreach (QString path,array_paths) {
151+
foreach (QString path, array_paths) {
152152
arrays << DiskReadMda(path);
153153
}
154154

155-
if (concat_dimension!=2) {
155+
if (concat_dimension != 2) {
156156
qCritical() << "For now concat_dimension must be 2!";
157157
return;
158158
}
159159

160-
d->m_use_concat=true;
161-
d->m_concat_dimension=concat_dimension;
162-
d->m_concat_list=arrays;
160+
d->m_use_concat = true;
161+
d->m_concat_dimension = concat_dimension;
162+
d->m_concat_list = arrays;
163163
}
164164

165165
DiskReadMda::~DiskReadMda()
@@ -209,14 +209,14 @@ void DiskReadMda::setPath(const QString& file_path)
209209
return;
210210
}
211211
}
212-
else if ((file_path.startsWith("["))&&(file_path.endsWith("]"))) {
213-
QString fp=file_path.mid(1,file_path.count()-2);
214-
QStringList list=fp.split("][");
215-
if (list.count()==1) {
216-
d->m_path=list[0];
212+
else if ((file_path.startsWith("[")) && (file_path.endsWith("]"))) {
213+
QString fp = file_path.mid(1, file_path.count() - 2);
214+
QStringList list = fp.split("][");
215+
if (list.count() == 1) {
216+
d->m_path = list[0];
217217
}
218218
else {
219-
setConcatPaths(2,list);
219+
setConcatPaths(2, list);
220220
}
221221
}
222222
else {
@@ -229,16 +229,16 @@ void DiskReadMda::setPrvObject(const QJsonObject& prv_object)
229229
d->m_prv_object = prv_object;
230230
}
231231

232-
void DiskReadMda::setConcatPaths(int concat_dimension, const QStringList &paths)
232+
void DiskReadMda::setConcatPaths(int concat_dimension, const QStringList& paths)
233233
{
234-
if (concat_dimension!=2) {
234+
if (concat_dimension != 2) {
235235
qWarning() << "For now, the concat_dimension must be 2";
236236
return;
237237
}
238-
d->m_use_concat=true;
239-
d->m_concat_dimension=concat_dimension;
238+
d->m_use_concat = true;
239+
d->m_concat_dimension = concat_dimension;
240240
d->m_concat_list.clear();
241-
foreach (QString path0,paths) {
241+
foreach (QString path0, paths) {
242242
d->m_concat_list << DiskReadMda(path0);
243243
}
244244
}
@@ -287,16 +287,15 @@ QString DiskReadMda::makePath() const
287287
}
288288
else if (d->m_use_concat) {
289289
QStringList list;
290-
if (d->m_concat_list.count()>0) {
291-
for (int i=0; i<d->m_concat_list.count(); i++) {
292-
list << "["+d->m_concat_list[i].makePath()+"]";
290+
if (d->m_concat_list.count() > 0) {
291+
for (int i = 0; i < d->m_concat_list.count(); i++) {
292+
list << "[" + d->m_concat_list[i].makePath() + "]";
293293
}
294294
return list.join("");
295295
}
296296
else {
297297
return "[]";
298298
}
299-
300299
}
301300
else {
302301
return d->m_path;
@@ -308,14 +307,14 @@ QJsonObject DiskReadMda::toPrvObject() const
308307
if (d->m_prv_object.isEmpty()) {
309308
if (d->m_use_concat) {
310309
QJsonArray concat_list;
311-
for (int i=0; i<d->m_concat_list.count(); i++) {
312-
QJsonObject obj=d->m_concat_list[i].toPrvObject();
310+
for (int i = 0; i < d->m_concat_list.count(); i++) {
311+
QJsonObject obj = d->m_concat_list[i].toPrvObject();
313312
concat_list.push_back(obj);
314313
}
315314
QJsonObject ret;
316-
ret["concat_list"]=concat_list;
317-
ret["concat_dimension"]=d->m_concat_dimension;
318-
ret["use_concat"]=true;
315+
ret["concat_list"] = concat_list;
316+
ret["concat_dimension"] = d->m_concat_dimension;
317+
ret["use_concat"] = true;
319318
return ret;
320319
}
321320
else {
@@ -461,26 +460,27 @@ DiskReadMda DiskReadMda::reshaped(long N1b, long N2b, long N3b, long N4b, long N
461460
return ret;
462461
}
463462

464-
bool read_chunk_from_concat_list(Mda &chunk,const QList<DiskReadMda> &list,long i0,long size0,int concat_dimension) {
465-
if (list.count()==0) {
463+
bool read_chunk_from_concat_list(Mda& chunk, const QList<DiskReadMda>& list, long i0, long size0, int concat_dimension)
464+
{
465+
if (list.count() == 0) {
466466
qWarning() << "Problem in read_chunk_from concat_list: list is empty";
467467
return false;
468468
}
469-
long N1=list[0].N1();
470-
if ((concat_dimension!=2)||(i0%N1!=0)||(size0%N1!=0)) {
469+
long N1 = list[0].N1();
470+
if ((concat_dimension != 2) || (i0 % N1 != 0) || (size0 % N1 != 0)) {
471471
qWarning() << "For now the concat_dimension must be 2 and the i and size in readChunk must be a multiples of N1";
472472
return false;
473473
}
474-
long pos1=i0/N1;
475-
long pos2=pos1+size0/N1-1;
474+
long pos1 = i0 / N1;
475+
long pos2 = pos1 + size0 / N1 - 1;
476476

477477
QVector<long> sizes;
478-
for (int j=0; j<list.count(); j++) {
479-
if (list[j].totalSize()%N1!=0) {
478+
for (int j = 0; j < list.count(); j++) {
479+
if (list[j].totalSize() % N1 != 0) {
480480
qWarning() << "For now the concat_dimension must be 2 and the individual arrays must have total size a multiple of N1" << N1 << list[j].totalSize();
481481
return false;
482482
}
483-
sizes << list[j].totalSize()/N1;
483+
sizes << list[j].totalSize() / N1;
484484
}
485485
QVector<long> start_points, end_points;
486486
start_points << 0;
@@ -499,7 +499,7 @@ bool read_chunk_from_concat_list(Mda &chunk,const QList<DiskReadMda> &list,long
499499
ii2++;
500500
}
501501

502-
chunk.allocate(1, N1*(pos2 - pos1 + 1));
502+
chunk.allocate(1, N1 * (pos2 - pos1 + 1));
503503
for (int ii = ii1; ii <= ii2; ii++) {
504504
Mda chunk_ii;
505505

@@ -529,8 +529,8 @@ bool read_chunk_from_concat_list(Mda &chunk,const QList<DiskReadMda> &list,long
529529
ssA = start_points[ii] - pos1;
530530
}
531531

532-
list[ii].readChunk(chunk_ii, N1*ttA, N1*(ttB - ttA + 1));
533-
chunk.setChunk(chunk_ii, N1*ssA);
532+
list[ii].readChunk(chunk_ii, N1 * ttA, N1 * (ttB - ttA + 1));
533+
chunk.setChunk(chunk_ii, N1 * ssA);
534534
}
535535
return true;
536536
}
@@ -542,7 +542,7 @@ bool DiskReadMda::readChunk(Mda& X, long i, long size) const
542542
return true;
543543
}
544544
else if (d->m_use_concat) {
545-
return read_chunk_from_concat_list(X,d->m_concat_list,i,size,d->m_concat_dimension);
545+
return read_chunk_from_concat_list(X, d->m_concat_list, i, size, d->m_concat_dimension);
546546
}
547547
if (!d->open_file_if_needed())
548548
return false;
@@ -573,9 +573,9 @@ bool DiskReadMda::readChunk(Mda& X, long i1, long i2, long size1, long size2) co
573573
return true;
574574
}
575575
else if (d->m_use_concat) {
576-
if (!readChunk(X,i1+N1()*i2,size1*size2))
576+
if (!readChunk(X, i1 + N1() * i2, size1 * size2))
577577
return false;
578-
return X.reshape(size1,size2);
578+
return X.reshape(size1, size2);
579579
}
580580
if (!d->open_file_if_needed())
581581
return false;
@@ -618,9 +618,9 @@ bool DiskReadMda::readChunk(Mda& X, long i1, long i2, long i3, long size1, long
618618
return true;
619619
}
620620
else if (d->m_use_concat) {
621-
if (!readChunk(X,i1+N1()*i2+N1()*N2()*i3,size1*size2*size3))
621+
if (!readChunk(X, i1 + N1() * i2 + N1() * N2() * i3, size1 * size2 * size3))
622622
return false;
623-
return X.reshape(size1,size2,size3);
623+
return X.reshape(size1, size2, size3);
624624
}
625625
if (!d->open_file_if_needed())
626626
return false;
@@ -716,29 +716,29 @@ bool DiskReadMdaPrivate::read_header_if_needed()
716716
return true;
717717
}
718718
else if (m_use_concat) {
719-
m_header_read=true;
720-
if (m_concat_list.count()==0) {
719+
m_header_read = true;
720+
if (m_concat_list.count() == 0) {
721721
qWarning() << "Cannot read header of concat array because list is empty";
722722
return false;
723723
}
724-
m_header=m_concat_list[0].mdaioHeader();
725-
long N2=0;
726-
for (int i=0; i<m_concat_list.count(); i++) {
727-
if (m_concat_list[i].N1()!=m_concat_list[0].N1()) {
724+
m_header = m_concat_list[0].mdaioHeader();
725+
long N2 = 0;
726+
for (int i = 0; i < m_concat_list.count(); i++) {
727+
if (m_concat_list[i].N1() != m_concat_list[0].N1()) {
728728
qWarning() << "dimension mismatch in concat list";
729729
return false;
730730
}
731-
if (m_concat_list[i].N3()!=m_concat_list[0].N3()) {
731+
if (m_concat_list[i].N3() != m_concat_list[0].N3()) {
732732
qWarning() << "dimension mismatch in concat list";
733733
return false;
734734
}
735-
if (m_concat_list[i].N4()!=m_concat_list[0].N4()) {
735+
if (m_concat_list[i].N4() != m_concat_list[0].N4()) {
736736
qWarning() << "dimension mismatch in concat list";
737737
return false;
738738
}
739-
N2+=m_concat_list[i].N2();
739+
N2 += m_concat_list[i].N2();
740740
}
741-
m_header.dims[1]=N2;
741+
m_header.dims[1] = N2;
742742
m_mda_header_total_size = 1;
743743
for (int i = 0; i < MDAIO_MAX_DIMS; i++)
744744
m_mda_header_total_size *= m_header.dims[i];

0 commit comments

Comments
 (0)