Skip to content

Commit 91d2579

Browse files
committed
Fix spelling error in libroom_src
1 parent 5564c7b commit 91d2579

File tree

5 files changed

+26
-26
lines changed

5 files changed

+26
-26
lines changed

deism/libroom_src/libroom.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ PYBIND11_MODULE(libroom_deism, m) {
123123
.def_readonly("obstructing_walls", &Room_deism<3>::obstructing_walls)
124124
.def_readonly("microphones", &Room_deism<3>::microphones)
125125
.def_readonly("max_dist", &Room_deism<3>::max_dist)
126-
.def_readonly("impedence",&Room_deism<3>::impedence) //--> new
126+
.def_readonly("impedance",&Room_deism<3>::impedance) //--> new
127127
.def_readonly("reflection_matrix",&Room_deism<3>::reflection_matrix) //--> new
128128
.def_readwrite("n_bands",&Room_deism<3>::n_bands); //--> new
129129

@@ -194,7 +194,7 @@ PYBIND11_MODULE(libroom_deism, m) {
194194
.def_readonly("obstructing_walls", &Room_deism<2>::obstructing_walls)
195195
.def_readonly("microphones", &Room_deism<2>::microphones)
196196
.def_readonly("max_dist", &Room_deism<2>::max_dist)
197-
.def_readonly("impedence",&Room_deism<2>::impedence) //--> new
197+
.def_readonly("impedance",&Room_deism<2>::impedance) //--> new
198198
.def_readonly("reflection_matrix",&Room_deism<2>::reflection_matrix) //--> new
199199
.def_readwrite("n_bands",&Room_deism<2>::n_bands); //--> new
200200

@@ -213,7 +213,7 @@ PYBIND11_MODULE(libroom_deism, m) {
213213
float&,
214214
const Eigen::ArrayXf &, const Eigen::ArrayXf &,
215215
const std::string &>(),
216-
py::arg("corners"),py::arg("centroid"), py::arg("impedence"),
216+
py::arg("corners"),py::arg("centroid"), py::arg("impedance"),
217217
py::arg("absorption") = Eigen::ArrayXf::Zero(1),
218218
py::arg("scattering") = Eigen::ArrayXf::Zero(1),
219219
py::arg("name") = "") //--> new
@@ -242,7 +242,7 @@ PYBIND11_MODULE(libroom_deism, m) {
242242
.def_readonly("basis", &Wall_deism<3>::basis)
243243
.def_readonly("flat_corners", &Wall_deism<3>::flat_corners)
244244
.def_readonly("reflection_matrix", &Wall_deism<3>::reflection_matrix) //tan new
245-
.def_readonly("impedence", &Wall_deism<3>::impedence) //tan new
245+
.def_readonly("impedance", &Wall_deism<3>::impedance) //tan new
246246
.def_readonly("centroid", &Wall_deism<3>::centroid); //-->new
247247

248248
py::enum_<Wall_deism<3>::Isect>(wall_cls, "Isect_deism")
@@ -270,7 +270,7 @@ PYBIND11_MODULE(libroom_deism, m) {
270270
const Eigen::ArrayXf &,
271271
const std::string &
272272
>(),
273-
py::arg("corners"),py::arg("centroid"), py::arg("impedence"),
273+
py::arg("corners"),py::arg("centroid"), py::arg("impedance"),
274274
py::arg("absorption") = Eigen::ArrayXf::Zero(1),
275275
py::arg("scattering") = Eigen::ArrayXf::Zero(1),
276276
py::arg("name") = "") //--> new
@@ -299,7 +299,7 @@ PYBIND11_MODULE(libroom_deism, m) {
299299
.def_readonly("basis", &Wall_deism<2>::basis)
300300
.def_readonly("flat_corners", &Wall_deism<2>::flat_corners)
301301
.def_readonly("reflection_matrix", &Wall_deism<2>::reflection_matrix) //--> new
302-
.def_readonly("impedence", &Wall_deism<2>::impedence) //--> new
302+
.def_readonly("impedance", &Wall_deism<2>::impedance) //--> new
303303
.def_readonly("centroid", &Wall_deism<2>::centroid); //--> new
304304

305305
// The different wall intersection cases

deism/libroom_src/room.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ Room_deism<D>::Room_deism(
127127
float _mic_radius,
128128
float _mic_hist_res,
129129
bool _is_hybrid_sim,
130-
float _impedence
130+
float _impedance
131131
)
132132
: walls(_walls), obstructing_walls(_obstructing_walls), microphones(_microphones),
133133
sound_speed(_sound_speed), ism_order(_ism_order),
134134
energy_thres(_energy_thres), time_thres(_time_thres), mic_radius(_mic_radius),
135135
mic_radius_sq(_mic_radius * _mic_radius),
136-
mic_hist_res(_mic_hist_res), is_hybrid_sim(_is_hybrid_sim),impedence(_impedence),is_shoebox(false)
136+
mic_hist_res(_mic_hist_res), is_hybrid_sim(_is_hybrid_sim),impedance(_impedance),is_shoebox(false)
137137
{
138138
init();
139139
}
@@ -153,12 +153,12 @@ Room_deism<D>::Room_deism(
153153
float _mic_radius,
154154
float _mic_hist_res,
155155
bool _is_hybrid_sim,
156-
float _impedence
156+
float _impedance
157157
)
158158
: microphones(_microphones),
159159
sound_speed(_sound_speed), ism_order(_ism_order), energy_thres(_energy_thres), time_thres(_time_thres),
160160
mic_radius(_mic_radius), mic_radius_sq(_mic_radius * _mic_radius),
161-
mic_hist_res(_mic_hist_res), is_hybrid_sim(_is_hybrid_sim),impedence(_impedence),
161+
mic_hist_res(_mic_hist_res), is_hybrid_sim(_is_hybrid_sim),impedance(_impedance),
162162
is_shoebox(true), shoebox_size(_room_size), shoebox_absorption(_absorption),
163163
shoebox_scattering(_scattering)
164164
{

deism/libroom_src/room.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@ class Room_deism
171171
/*20240705*/
172172
/**************************************************************************/
173173
/* */
174-
// impedence is a ndarray value, each value correspondes to a wall, its value
174+
// impedance is a ndarray value, each value correspondes to a wall, its value
175175
// type is complex, like[], but now is only a integer number
176-
float impedence; // set initial value of impedence
176+
float impedance; // set initial value of impedance
177177
// the last dimension of reflection matrix is dynamic, which depends on running
178178
std::vector<Eigen::Matrix<float,D,D>> reflection_matrix;
179179
/* */
@@ -217,7 +217,7 @@ class Room_deism
217217

218218

219219
/**************************************************************************/
220-
// new constructor after increasing impedence variable
220+
// new constructor after increasing impedance variable
221221
// Constructor for general rooms
222222
Room_deism(
223223
const std::vector<Wall_deism<D>> &_walls,
@@ -232,7 +232,7 @@ class Room_deism
232232
float _mic_radius,
233233
float _mic_hist_res,
234234
bool _is_hybrid_sim,
235-
float _impedence
235+
float _impedance
236236
);
237237

238238
// Constructor for shoebox rooms
@@ -250,7 +250,7 @@ class Room_deism
250250
float _mic_radius,
251251
float _mic_hist_res,
252252
bool _is_hybrid_sim,
253-
float _impedence
253+
float _impedance
254254
);
255255
/**************************************************************************/
256256

@@ -296,7 +296,7 @@ class Room_deism
296296
float _mic_radius,
297297
float _mic_hist_res,
298298
bool _is_hybrid_sim,
299-
float _impedence
299+
float _impedance
300300
)
301301
{
302302
sound_speed = _sound_speed;
@@ -307,7 +307,7 @@ class Room_deism
307307
mic_radius_sq = _mic_radius * _mic_radius;
308308
mic_hist_res = _mic_hist_res;
309309
is_hybrid_sim = _is_hybrid_sim;
310-
impedence=_impedence;
310+
impedance=_impedance;
311311
}
312312

313313
Eigen::ArrayXf get_image_attenuation(ImageSource<D>& old_is,

deism/libroom_src/wall.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void Wall_deism<D>::init()
166166
}
167167
}
168168

169-
// original constructor without centroid and impedence
169+
// original constructor without centroid and impedance
170170
template<>
171171
Wall_deism<2>::Wall_deism(
172172
const Eigen::Matrix<float,2,Eigen::Dynamic> &_corners,
@@ -237,14 +237,14 @@ template<>
237237
Wall_deism<2>::Wall_deism(
238238
const Eigen::Matrix<float,2,Eigen::Dynamic> &_corners,
239239
const Eigen::Matrix<float,2,1>& _centroid,
240-
float _impedence,
240+
float _impedance,
241241
const Eigen::ArrayXf &_absorption,
242242
const Eigen::ArrayXf &_scatter,
243243
const std::string &_name
244244
)
245245
: Wall_deism<2>::Wall_deism(_corners,_centroid,_absorption,_scatter,_name)
246246
{
247-
impedence=_impedence;
247+
impedance=_impedance;
248248
}
249249
/******************************************************************************/
250250

@@ -380,13 +380,13 @@ template<>
380380
Wall_deism<3>::Wall_deism(
381381
const Eigen::Matrix<float,3,Eigen::Dynamic> &_corners,
382382
const Eigen::Matrix<float,3,1>& _centroid,
383-
float _impedence,
383+
float _impedance,
384384
const Eigen::ArrayXf &_absorption,
385385
const Eigen::ArrayXf &_scatter,
386386
const std::string &_name
387387
):Wall_deism<3>::Wall_deism(_corners,_centroid,_absorption,_scatter,_name)
388388
{
389-
impedence=_impedence;
389+
impedance=_impedance;
390390
}
391391
/******************************************************************************/
392392

@@ -590,7 +590,7 @@ float Wall_deism<D>::cosine_angle(
590590
// area for new member functions
591591
template<size_t D>
592592
float Wall_deism<D>::get_attenuation(float theta) const {
593-
return (this->impedence*cos(theta)-1)/(this->impedence*cos(theta)+1);
593+
return (this->impedance*cos(theta)-1)/(this->impedance*cos(theta)+1);
594594
};
595595

596596
/**************************************************************************/

deism/libroom_src/wall.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class Wall_deism
8888

8989
/**************************************************************************/
9090
// area for new parameters
91-
float impedence; //-->new
91+
float impedance; //-->new
9292

9393
/**************************************************************************/
9494

@@ -127,7 +127,7 @@ class Wall_deism
127127
Wall_deism(
128128
const Eigen::Matrix<float, D, Eigen::Dynamic> &_corners,
129129
const Eigen::Matrix<float,D,1>& _centroid, //-->new
130-
float _impedence,
130+
float _impedance,
131131
const Eigen::ArrayXf &_absorption,
132132
const Eigen::ArrayXf &_scatter,
133133
const std::string &_name
@@ -141,7 +141,7 @@ class Wall_deism
141141
transmission(w.transmission), energy_reflection(w.energy_reflection),
142142
normal(w.normal), corners(w.corners),
143143
origin(w.origin), basis(w.basis), flat_corners(w.flat_corners),
144-
impedence(w.impedence),reflection_matrix(w.reflection_matrix),
144+
impedance(w.impedance),reflection_matrix(w.reflection_matrix),
145145
centroid(w.centroid)
146146
{}
147147

0 commit comments

Comments
 (0)