Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PointCloud
Flann
提交
15d64a3c
F
Flann
项目概览
PointCloud
/
Flann
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flann
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
15d64a3c
编写于
2月 25, 2011
作者:
M
Marius Muja
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of ubc:lci/fann
上级
6e6d4a31
b82202ea
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
19 deletion
+20
-19
src/cpp/flann/algorithms/kdtree_index.h
src/cpp/flann/algorithms/kdtree_index.h
+1
-0
src/cpp/flann/algorithms/kmeans_index.h
src/cpp/flann/algorithms/kmeans_index.h
+1
-1
src/cpp/flann/util/pair_iterator.hpp
src/cpp/flann/util/pair_iterator.hpp
+18
-18
未找到文件。
src/cpp/flann/algorithms/kdtree_index.h
浏览文件 @
15d64a3c
...
...
@@ -41,6 +41,7 @@
#include "flann/util/matrix.h"
#include "flann/util/result_set.h"
#include "flann/util/heap.h"
#include "flann/util/logger.h"
#include "flann/util/allocator.h"
#include "flann/util/random.h"
#include "flann/util/saving.h"
...
...
src/cpp/flann/algorithms/kmeans_index.h
浏览文件 @
15d64a3c
...
...
@@ -68,7 +68,7 @@ struct KMeansIndexParams : public IndexParams {
void
fromParameters
(
const
FLANNParameters
&
p
)
{
assert
(
p
.
algorithm
==
KMEANS
);
assert
(
p
.
algorithm
==
FLANN_INDEX_
KMEANS
);
branching
=
p
.
branching
;
iterations
=
p
.
iterations
;
centers_init
=
p
.
centers_init
;
...
...
src/cpp/flann/util/pair_iterator.hpp
浏览文件 @
15d64a3c
...
...
@@ -91,24 +91,24 @@ public:
pair_iterator
(
SortIterator
si
,
PermuteIterator
pi
)
:
si_
(
si
),
pi_
(
pi
)
{
}
// operators
self
&
operator
++
(
)
{
++
si_
;
++
pi_
;
return
*
this
;
}
self
operator
++
(
int
)
{
self
tmp
=
*
this
;
si_
++
;
pi_
++
;
return
tmp
;
}
self
&
operator
--
(
)
{
--
si_
;
--
pi_
;
return
*
this
;
}
self
operator
--
(
int
)
{
self
tmp
=
*
this
;
si_
--
;
pi_
--
;
return
tmp
;
}
self
&
operator
+=
(
difference_type
x
)
{
si_
+=
x
;
pi_
+=
x
;
return
*
this
;
}
self
&
operator
-=
(
difference_type
x
)
{
si_
-=
x
;
pi_
-=
x
;
return
*
this
;
}
reference
operator
[](
difference_type
n
)
{
return
reference
(
*
(
si_
+
n
),
*
(
si_
+
n
));
}
reference
operator
*
()
const
{
return
reference
(
*
si_
,
*
pi_
);
}
self
operator
+
(
difference_type
y
)
{
return
self
(
si_
+
y
,
pi_
+
y
);
}
self
operator
-
(
difference_type
y
)
{
return
self
(
si_
-
y
,
pi_
-
y
);
}
bool
operator
==
(
const
self
&
y
)
{
return
si_
==
y
.
si_
;
}
bool
operator
!=
(
const
self
&
y
)
{
return
si_
!=
y
.
si_
;
}
bool
operator
<
(
const
self
&
y
)
{
return
si_
<
y
.
si_
;
}
difference_type
operator
-
(
const
self
&
y
)
{
return
si_
-
y
.
si_
;
}
inline
self
&
operator
++
(
)
{
++
si_
;
++
pi_
;
return
*
this
;
}
inline
self
operator
++
(
int
)
{
self
tmp
=
*
this
;
si_
++
;
pi_
++
;
return
tmp
;
}
inline
self
&
operator
--
(
)
{
--
si_
;
--
pi_
;
return
*
this
;
}
inline
self
operator
--
(
int
)
{
self
tmp
=
*
this
;
si_
--
;
pi_
--
;
return
tmp
;
}
inline
self
&
operator
+=
(
difference_type
x
)
{
si_
+=
x
;
pi_
+=
x
;
return
*
this
;
}
inline
self
&
operator
-=
(
difference_type
x
)
{
si_
-=
x
;
pi_
-=
x
;
return
*
this
;
}
inline
reference
operator
[](
difference_type
n
)
{
return
reference
(
*
(
si_
+
n
),
*
(
si_
+
n
));
}
inline
reference
operator
*
()
const
{
return
reference
(
*
si_
,
*
pi_
);
}
inline
self
operator
+
(
difference_type
y
)
{
return
self
(
si_
+
y
,
pi_
+
y
);
}
inline
self
operator
-
(
difference_type
y
)
{
return
self
(
si_
-
y
,
pi_
-
y
);
}
inline
bool
operator
==
(
const
self
&
y
)
{
return
si_
==
y
.
si_
;
}
inline
bool
operator
!=
(
const
self
&
y
)
{
return
si_
!=
y
.
si_
;
}
inline
bool
operator
<
(
const
self
&
y
)
{
return
si_
<
y
.
si_
;
}
inline
difference_type
operator
-
(
const
self
&
y
)
{
return
si_
-
y
.
si_
;
}
// friend operators
friend
self
operator
+
(
difference_type
x
,
const
self
&
y
)
{
return
y
+
x
;
}
friend
self
operator
-
(
difference_type
x
,
const
self
&
y
)
{
return
y
-
x
;
}
friend
inline
self
operator
+
(
difference_type
x
,
const
self
&
y
)
{
return
y
+
x
;
}
friend
inline
self
operator
-
(
difference_type
x
,
const
self
&
y
)
{
return
y
-
x
;
}
private:
SortIterator
si_
;
PermuteIterator
pi_
;
...
...
@@ -121,14 +121,14 @@ typename pair_iterator_traits<SortIterator, PermuteIterator>::value_type,
bool
>
{
typedef
typename
pair_iterator_traits
<
SortIterator
,
PermuteIterator
>::
value_type
T
;
bool
operator
()(
const
T
&
t1
,
const
T
&
t2
)
inline
bool
operator
()(
const
T
&
t1
,
const
T
&
t2
)
{
return
(
t1
.
first
<
t2
.
first
);
}
};
template
<
class
SortIterator
,
class
PermuteIterator
>
pair_iterator
<
SortIterator
,
PermuteIterator
>
make_pair_iterator
(
SortIterator
si
,
PermuteIterator
pi
)
inline
pair_iterator
<
SortIterator
,
PermuteIterator
>
make_pair_iterator
(
SortIterator
si
,
PermuteIterator
pi
)
{
return
pair_iterator
<
SortIterator
,
PermuteIterator
>
(
si
,
pi
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录