Skip to content

Commit 85ca48d

Browse files
ShadyBoukharyumar456
ShadyBoukhary
authored and
umar456
committed
formatted
1 parent 6c00ae5 commit 85ca48d

File tree

3 files changed

+29
-34
lines changed

3 files changed

+29
-34
lines changed

‎src/java/java.cpp‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ void throwArrayFireException(JNIEnv *env, const char *functionName,
5050

5151
const std::string constructorSig = generateFunctionSignature(
5252
JavaType::Void, {JavaType::Int, JavaType::String});
53-
jmethodID constructor =env->GetMethodID(exceptionClass, "<init>",
54-
constructorSig.c_str());
53+
jmethodID constructor =
54+
env->GetMethodID(exceptionClass, "<init>", constructorSig.c_str());
5555

5656
jthrowable exception = reinterpret_cast<jthrowable>(
5757
env->NewObject(exceptionClass, constructor, code,
@@ -62,8 +62,8 @@ void throwArrayFireException(JNIEnv *env, const char *functionName,
6262
const std::string setLocationSig = generateFunctionSignature(
6363
JavaType::Void, {JavaType::String, JavaType::String, JavaType::Int});
6464

65-
jmethodID setLocationID = env->GetMethodID(exceptionClass, "setLocation",
66-
setLocationSig.c_str());
65+
jmethodID setLocationID =
66+
env->GetMethodID(exceptionClass, "setLocation", setLocationSig.c_str());
6767

6868
env->CallVoidMethod(exception, setLocationID, env->NewStringUTF(functionName),
6969
env->NewStringUTF(file), line);
@@ -74,30 +74,28 @@ void throwArrayFireException(JNIEnv *env, const char *functionName,
7474

7575
template <typename... Args>
7676
jobject createJavaObject(JNIEnv *env, JavaObjects objectType, Args... args) {
77-
switch (objectType) {
77+
switch (objectType) {
7878
case JavaObjects::FloatComplex: {
79-
8079
static jclass cls = env->FindClass("com/arrayfire/FloatComplex");
81-
static std::string sig = generateFunctionSignature(JavaType::Void,
82-
{JavaType::Float, JavaType::Float});
80+
static std::string sig = generateFunctionSignature(
81+
JavaType::Void, {JavaType::Float, JavaType::Float});
8382
static jmethodID id = env->GetMethodID(cls, "<init>", sig.c_str());
8483
jobject obj = env->NewObject(cls, id, args...);
8584
return obj;
8685

8786
} break;
8887
case JavaObjects::DoubleComplex: {
89-
9088
static jclass cls = env->FindClass("com/arrayfire/DoubleComplex");
9189
static std::string sig = generateFunctionSignature(
9290
JavaType::Void, {JavaType::Double, JavaType::Double});
9391
static jmethodID id = env->GetMethodID(cls, "<init>", sig.c_str());
9492
jobject obj = env->NewObject(cls, id, args...);
9593
return obj;
9694
} break;
97-
}
95+
}
9896
}
99-
#define INSTANTIATE(type) \
100-
template jobject createJavaObject<type>(JNIEnv *, JavaObjects, type, type); \
97+
#define INSTANTIATE(type) \
98+
template jobject createJavaObject<type>(JNIEnv *, JavaObjects, type, type);
10199

102100
INSTANTIATE(float)
103101
INSTANTIATE(double)

‎src/java/java.h‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,9 @@
55

66
namespace java {
77

8-
enum class JavaObjects {
9-
FloatComplex,
10-
DoubleComplex
11-
};
8+
enum class JavaObjects { FloatComplex, DoubleComplex };
129

13-
template<typename... Args>
10+
template <typename... Args>
1411
jobject createJavaObject(JNIEnv *env, JavaObjects objectType, Args... args);
1512

1613
void throwArrayFireException(JNIEnv *env, const char *functionName,
@@ -24,9 +21,9 @@ void throwArrayFireException(JNIEnv *env, const char *functionName,
2421
return 0; \
2522
}
2623

27-
#define AF_CHECK_VOID(err) \
28-
if (err != AF_SUCCESS) { \
29-
java::throwArrayFireException(env, __func__, __FILE__, __LINE__, \
30-
(int)err); \
31-
return; \
24+
#define AF_CHECK_VOID(err) \
25+
if (err != AF_SUCCESS) { \
26+
java::throwArrayFireException(env, __func__, __FILE__, __LINE__, \
27+
(int)err); \
28+
return; \
3229
}

‎src/statistics.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ BEGIN_EXTERN_C
55

66
#define STATISTICS_FUNC(FUNC) AF_MANGLE(Statistics, FUNC)
77

8-
#define INSTANTIATE_MEAN(jtype) \
9-
JNIEXPORT jobject JNICALL STATISTICS_FUNC(afMeanAll##jtype)( \
10-
JNIEnv * env, jclass clazz, jlong ref) { \
11-
double real = 0, img = 0; \
12-
AF_CHECK(af_mean_all(&real, &img, ARRAY(ref))); \
8+
#define INSTANTIATE_MEAN(jtype) \
9+
JNIEXPORT jobject JNICALL STATISTICS_FUNC(afMeanAll##jtype)( \
10+
JNIEnv * env, jclass clazz, jlong ref) { \
11+
double real = 0, img = 0; \
12+
AF_CHECK(af_mean_all(&real, &img, ARRAY(ref))); \
1313
return java::createJavaObject(env, java::JavaObjects::jtype, real, img); \
1414
}
1515

16-
#define INSTANTIATE_WEIGHTED(jtype, Name, name) \
16+
#define INSTANTIATE_WEIGHTED(jtype, Name, name) \
1717
JNIEXPORT jobject JNICALL STATISTICS_FUNC(af##Name##All##jtype##Weighted)( \
1818
JNIEnv * env, jclass clazz, jlong ref, jlong weightsRef) { \
1919
double real = 0, img = 0; \
@@ -39,12 +39,12 @@ BEGIN_EXTERN_C
3939
return JLONG(ret); \
4040
}
4141

42-
#define INSTANTIATE_VAR(jtype) \
43-
JNIEXPORT jobject JNICALL STATISTICS_FUNC(afVarAll##jtype)( \
44-
JNIEnv * env, jclass clazz, jlong ref, jboolean isBiased) { \
45-
double real = 0, img = 0; \
46-
AF_CHECK(af_var_all(&real, &img, ARRAY(ref), isBiased)); \
47-
return java::createJavaObject(env, java::JavaObjects::jtype, real, img); \
42+
#define INSTANTIATE_VAR(jtype) \
43+
JNIEXPORT jobject JNICALL STATISTICS_FUNC(afVarAll##jtype)( \
44+
JNIEnv * env, jclass clazz, jlong ref, jboolean isBiased) { \
45+
double real = 0, img = 0; \
46+
AF_CHECK(af_var_all(&real, &img, ARRAY(ref), isBiased)); \
47+
return java::createJavaObject(env, java::JavaObjects::jtype, real, img); \
4848
}
4949

5050
JNIEXPORT jlong JNICALL STATISTICS_FUNC(afMean)(JNIEnv *env, jclass clazz,

0 commit comments

Comments
 (0)