Repository: reef
Updated Branches:
refs/heads/master de6a9627b -> d33717097
[REEF-1153] Fix typos in class/function names
This fixes the followings:
* Rename `getEvaluatorDescriptorSring` with
`getEvaluatorDescriptorString` in both reef-bridge-java and
Org.Apache.REEF.Bridge.
* Rename `ProbabilityOfSuccesfulIteration.java` with
`ProbabilityOfSuccessfulIteration.java` and update related codes.
* Fix typos in two unit test function names in reef-tang.
JIRA:
[REEF-1153](https://issues.apache.org/jira/browse/REEF-1153)
Pull Request:
This closes #795
Project: http://git-wip-us.apache.org/repos/asf/reef/repo
Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/d3371709
Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/d3371709
Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/d3371709
Branch: refs/heads/master
Commit: d33717097761b74f3dd49aeb9a31c07c155e132b
Parents: de6a962
Author: Dongjoon Hyun <[email protected]>
Authored: Mon Jan 25 14:59:02 2016 -0800
Committer: Markus Weimer <[email protected]>
Committed: Thu Jan 28 13:46:49 2016 -0800
----------------------------------------------------------------------
.../Org.Apache.REEF.Bridge/CommonUtilities.cpp | 2 +-
.../reef/javabridge/ActiveContextBridge.java | 2 +-
.../javabridge/AllocatedEvaluatorBridge.java | 2 +-
.../reef/javabridge/ClosedContextBridge.java | 2 +-
.../reef/javabridge/FailedContextBridge.java | 2 +-
.../bgd/parameters/BGDControlParameters.java | 6 ++--
.../ProbabilityOfSuccesfulIteration.java | 30 --------------------
.../ProbabilityOfSuccessfulIteration.java | 30 ++++++++++++++++++++
.../org/apache/reef/tang/TestBindSingleton.java | 2 +-
.../tang/formats/TestConfigurationModule.java | 2 +-
10 files changed, 40 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
----------------------------------------------------------------------
diff --git a/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
b/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
index c7888fe..2a206f4 100644
--- a/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
+++ b/lang/cs/Org.Apache.REEF.Bridge/CommonUtilities.cpp
@@ -32,7 +32,7 @@ namespace Org {
ManagedLog::LOGGER->LogStart("CommonUtilities::GetEvaluatorDescriptor");
JNIEnv *env = RetrieveEnv(jvm);
jclass jclassActiveContext =
env->GetObjectClass(object);
- jmethodID jmidGetEvaluatorDescriptor =
env->GetMethodID(jclassActiveContext, "getEvaluatorDescriptorSring",
"()Ljava/lang/String;");
+ jmethodID jmidGetEvaluatorDescriptor =
env->GetMethodID(jclassActiveContext, "getEvaluatorDescriptorString",
"()Ljava/lang/String;");
if (jmidGetEvaluatorDescriptor == NULL) {
ManagedLog::LOGGER->Log("jmidGetEvaluatorDescriptor is NULL");
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ActiveContextBridge.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ActiveContextBridge.java
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ActiveContextBridge.java
index 7d068f8..30a5667 100644
---
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ActiveContextBridge.java
+++
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ActiveContextBridge.java
@@ -71,7 +71,7 @@ public final class ActiveContextBridge extends NativeBridge
implements Identifia
((EvaluatorContext)jactiveContext).submitTask(taskConfigurationString);
}
- public String getEvaluatorDescriptorSring() {
+ public String getEvaluatorDescriptorString() {
final String descriptorString =
Utilities.getEvaluatorDescriptorString(jactiveContext.getEvaluatorDescriptor());
LOG.log(Level.FINE, "active context - serialized evaluator descriptor: " +
descriptorString);
return descriptorString;
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java
index d7281f1..bdf87f4 100644
---
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java
+++
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/AllocatedEvaluatorBridge.java
@@ -139,7 +139,7 @@ public final class AllocatedEvaluatorBridge extends
NativeBridge implements Iden
* Gets the serialized evaluator descriptor from the Java allocated
evaluator.
* @return the serialized evaluator descriptor.
*/
- public String getEvaluatorDescriptorSring() {
+ public String getEvaluatorDescriptorString() {
final String descriptorString =
Utilities.getEvaluatorDescriptorString(jallocatedEvaluator.getEvaluatorDescriptor());
LOG.log(Level.INFO, "allocated evaluator - serialized evaluator
descriptor: " + descriptorString);
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java
index 17f638c..bba73e8 100644
---
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java
+++
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/ClosedContextBridge.java
@@ -78,7 +78,7 @@ public final class ClosedContextBridge extends NativeBridge
implements ClosedCon
public void close() throws Exception {
}
- public String getEvaluatorDescriptorSring() {
+ public String getEvaluatorDescriptorString() {
final String descriptorString =
Utilities.getEvaluatorDescriptorString(evaluatorDescriptor);
LOG.log(Level.INFO, "Closed Context - serialized evaluator descriptor: " +
descriptorString);
return descriptorString;
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedContextBridge.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedContextBridge.java
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedContextBridge.java
index f17caf3..314146b 100644
---
a/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedContextBridge.java
+++
b/lang/java/reef-bridge-java/src/main/java/org/apache/reef/javabridge/FailedContextBridge.java
@@ -94,7 +94,7 @@ public final class FailedContextBridge extends NativeBridge
implements ContextBa
return parentContext;
}
- public String getEvaluatorDescriptorSring() {
+ public String getEvaluatorDescriptorString() {
final String descriptorString =
Utilities.getEvaluatorDescriptorString(evaluatorDescriptor);
LOG.log(Level.INFO, "Failed Context - serialized evaluator descriptor: " +
descriptorString);
return descriptorString;
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/BGDControlParameters.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/BGDControlParameters.java
b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/BGDControlParameters.java
index 872b88f..3caaa88 100644
---
a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/BGDControlParameters.java
+++
b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/BGDControlParameters.java
@@ -48,7 +48,7 @@ public final class BGDControlParameters {
@Parameter(Lambda.class) final double lambda,
@Parameter(Eps.class) final double eps,
@Parameter(Eta.class) final double eta,
- @Parameter(ProbabilityOfSuccesfulIteration.class) final double
probOfSuccessfulIteration,
+ @Parameter(ProbabilityOfSuccessfulIteration.class) final double
probOfSuccessfulIteration,
@Parameter(Iterations.class) final int iters,
@Parameter(EnableRampup.class) final boolean rampup,
@Parameter(MinParts.class) final int minParts,
@@ -70,7 +70,7 @@ public final class BGDControlParameters {
.bindNamedParameter(Lambda.class, Double.toString(this.lambda))
.bindNamedParameter(Eps.class, Double.toString(this.eps))
.bindNamedParameter(Eta.class, Double.toString(this.eta))
- .bindNamedParameter(ProbabilityOfSuccesfulIteration.class,
Double.toString(probOfSuccessfulIteration))
+ .bindNamedParameter(ProbabilityOfSuccessfulIteration.class,
Double.toString(probOfSuccessfulIteration))
.bindNamedParameter(Iterations.class, Integer.toString(this.iters))
.bindNamedParameter(EnableRampup.class, Boolean.toString(this.rampup))
.bindNamedParameter(MinParts.class, Integer.toString(this.minParts))
@@ -84,7 +84,7 @@ public final class BGDControlParameters {
.registerShortNameOfClass(Lambda.class)
.registerShortNameOfClass(Eps.class)
.registerShortNameOfClass(Eta.class)
- .registerShortNameOfClass(ProbabilityOfSuccesfulIteration.class)
+ .registerShortNameOfClass(ProbabilityOfSuccessfulIteration.class)
.registerShortNameOfClass(Iterations.class)
.registerShortNameOfClass(EnableRampup.class)
.registerShortNameOfClass(MinParts.class)
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccesfulIteration.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccesfulIteration.java
b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccesfulIteration.java
deleted file mode 100644
index 573d368..0000000
---
a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccesfulIteration.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.reef.examples.group.bgd.parameters;
-
-import org.apache.reef.tang.annotations.Name;
-import org.apache.reef.tang.annotations.NamedParameter;
-
-/**
- * Break criterion for the optimizer. If the progress in mean loss between
- * two iterations is less than this, the optimization stops.
- */
-@NamedParameter(short_name = "psuccess", default_value = "0.5")
-public final class ProbabilityOfSuccesfulIteration implements Name<Double> {
-}
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccessfulIteration.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccessfulIteration.java
b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccessfulIteration.java
new file mode 100644
index 0000000..3936ea5
--- /dev/null
+++
b/lang/java/reef-examples/src/main/java/org/apache/reef/examples/group/bgd/parameters/ProbabilityOfSuccessfulIteration.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.reef.examples.group.bgd.parameters;
+
+import org.apache.reef.tang.annotations.Name;
+import org.apache.reef.tang.annotations.NamedParameter;
+
+/**
+ * Break criterion for the optimizer. If the progress in mean loss between
+ * two iterations is less than this, the optimization stops.
+ */
+@NamedParameter(short_name = "psuccess", default_value = "0.5")
+public final class ProbabilityOfSuccessfulIteration implements Name<Double> {
+}
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
index 336fbe9..8665b41 100644
---
a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
+++
b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/TestBindSingleton.java
@@ -97,7 +97,7 @@ public class TestBindSingleton {
}
@Test
- public void testMultipleInjectorInstaceWithSingleton() throws BindException,
InjectionException {
+ public void testMultipleInjectorInstanceWithSingleton() throws
BindException, InjectionException {
final JavaConfigurationBuilder cb =
Tang.Factory.getTang().newConfigurationBuilder();
final Injector i1 = Tang.Factory.getTang().newInjector(cb.build());
http://git-wip-us.apache.org/repos/asf/reef/blob/d3371709/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
----------------------------------------------------------------------
diff --git
a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
index a0b4b51..d03a237 100644
---
a/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
+++
b/lang/java/reef-tang/tang/src/test/java/org/apache/reef/tang/formats/TestConfigurationModule.java
@@ -294,7 +294,7 @@ public class TestConfigurationModule {
}
@Test
- public void immutablilityTest() throws BindException, InjectionException {
+ public void immutabilityTest() throws BindException, InjectionException {
// builder methods return copies; the original module is immutable
final ConfigurationModule builder1 = MyConfigurationModule.CONF
.set(MyConfigurationModule.THE_FOO, FooImpl.class)
