propane 3.6.0-java → 3.10.0-java

data/lib/propane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Propane
-  VERSION = '3.6.0'
+  VERSION = '3.10.0'
 end

data/library/pdf/pdf.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  require_relative 'itextpdf-5.5.13.2.jar'
+  java_import Java::ProcessingPdf::PGraphicsPDF
+end

data/library/svg/svg.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# @TODO usage
+class Propane::App
+  require_relative 'batik-all-1.14.jar'
+  java_import Java::ProcessingSvg::PGraphicsSVG
+end

data/mvnw

@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -246,7 +246,7 @@ else
         else
             curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
         fi
-        
+
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"

data/mvnw.cmd

@@ -120,7 +120,7 @@ SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
 set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
 set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
 
 FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
     IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
@@ -134,7 +134,7 @@ if exist %WRAPPER_JAR% (
     )
 ) else (
     if not "%MVNW_REPOURL%" == "" (
-        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     )
     if "%MVNW_VERBOSE%" == "true" (
         echo Couldn't find %WRAPPER_JAR%, downloading it ...

data/pom.rb

@@ -2,7 +2,7 @@
 
 project 'propane', 'https://github.com/monkstone/propane' do
   model_version '4.0.0'
-  id 'propane:propane:3.6.0'
+  id 'propane:propane:3.10.0'
   packaging 'jar'
 
   description 'An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.'
@@ -44,18 +44,41 @@ project 'propane', 'https://github.com/monkstone/propane' do
       'polyglot.dump.pom' => 'pom.xml',
       'project.build.sourceEncoding' => 'utf-8',
       'jogl.version' => '2.3.2', # for compiling actual included 2.4.0-rc
+      'batik.version' => '1.14',
+      'itextpdf.version' => '5.5.13.2',
       'jruby.api' => 'http://jruby.org/apidocs/')
 
-      pom 'org.jruby:jruby:9.2.14.0'
+      pom 'org.jruby:jruby:9.2.17.0'
+      jar 'org.apache.xmlgraphics:batik-all:${batik.version}'
+      jar 'com.itextpdf:itextpdf:${itextpdf.version}'
       jar 'org.processing:video:3.3.7' # only for compiling
       jar 'org.jogamp.jogl:jogl-all:${jogl.version}'
       jar 'org.jogamp.gluegen:gluegen-rt-main:${jogl.version}'
 
       overrides do
+
         plugin('org.codehaus.mojo:versions-maven-plugin:2.7',
           'generateBackupPoms' => 'false')
           plugin(:compiler, '3.8.1',
             'release' => '11')
+            plugin :dependency, '3.1.2' do
+              execute_goals( id: 'default-cli',
+                artifactItems:[
+                  { groupId: 'com.itextpdf',
+                    artifactId: 'itextpdf',
+                    version: '${itextpdf.version}',
+                    type: 'jar',
+                    outputDirectory: '${propane.basedir}/library/pdf'
+                  },
+                  { groupId: 'org.apache.xmlgraphics',
+                    artifactId: 'batik-all',
+                    version: '${batik.version}',
+                    type: 'jar',
+                    outputDirectory: '${propane.basedir}/library/svg'
+                  }
+                ]
+              )
+            end
             plugin(:javadoc, '3.2.0',
               'detectOfflineLinks' => 'false',
               'links' => ['${jruby.api}',
@@ -65,7 +88,8 @@ project 'propane', 'https://github.com/monkstone/propane' do
                     'manifestEntries' => {
                       'Automatic-Module-Name' => 'processing.core'
                     }
-                    })                    
+                    })
+                    plugin('org.apache.maven.plugins:maven-pmd-plugin:3.14.0')
                   end
                   build do
                     resource do
@@ -80,3 +104,6 @@ project 'propane', 'https://github.com/monkstone/propane' do
                     end
                   end
                 end
+                reporting do
+                  plugin('org.apache.maven.plugins:maven-jxr-plugin:2.3')                  
+                end

data/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>propane</groupId>
   <artifactId>propane</artifactId>
-  <version>3.6.0</version>
+  <version>3.10.0</version>
   <name>propane</name>
   <description>An integrated processing-core (somewhat hacked), with additional java code for a jruby version of processing.</description>
   <url>https://github.com/monkstone/propane</url>
@@ -62,6 +62,8 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/propane/issues</url>
   </issueManagement>
   <properties>
+    <batik.version>1.14</batik.version>
+    <itextpdf.version>5.5.13.2</itextpdf.version>
     <jogl.version>2.3.2</jogl.version>
     <jruby.api>http://jruby.org/apidocs/</jruby.api>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
@@ -74,9 +76,19 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>9.2.14.0</version>
+      <version>9.2.17.0</version>
       <type>pom</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.xmlgraphics</groupId>
+      <artifactId>batik-all</artifactId>
+      <version>${batik.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.itextpdf</groupId>
+      <artifactId>itextpdf</artifactId>
+      <version>${itextpdf.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>video</artifactId>
@@ -130,6 +142,33 @@ DO NOT MODIFIY - GENERATED CODE
             <release>11</release>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.1.2</version>
+          <executions>
+            <execution>
+              <id>default-cli</id>
+              <configuration>
+                <artifactItems>
+                  <artifactItem>
+                    <groupId>com.itextpdf</groupId>
+                    <artifactId>itextpdf</artifactId>
+                    <version>${itextpdf.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${propane.basedir}/library/pdf</outputDirectory>
+                  </artifactItem>
+                  <artifactItem>
+                    <groupId>org.apache.xmlgraphics</groupId>
+                    <artifactId>batik-all</artifactId>
+                    <version>${batik.version}</version>
+                    <type>jar</type>
+                    <outputDirectory>${propane.basedir}/library/svg</outputDirectory>
+                  </artifactItem>
+                </artifactItems>
+              </configuration>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>3.2.0</version>
@@ -152,7 +191,19 @@ DO NOT MODIFIY - GENERATED CODE
             </archive>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-pmd-plugin</artifactId>
+          <version>3.14.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.3</version>
+      </plugin>
+    </plugins>
+  </reporting>
 </project>

data/propane.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email         = ['mamba2928@yahoo.co.uk']
   gem.licenses     = %w[GPL-3.0 LGPL-2.0]
   gem.description  = <<-EOS
-  A batteries included version of processing in ruby targetting jdk11.
+  A batteries included version of processing in ruby targetting jdk11+.
   EOS
   gem.summary       = 'ruby implementation of processing-4.0 on MacOS, linux and windows (64bit only)'
   gem.homepage      = 'https://ruby-processing.github.io/propane/'
@@ -21,15 +21,19 @@ Gem::Specification.new do |gem|
   gem.files << 'lib/jogl-all.jar'
   gem.files << 'lib/gluegen-rt-natives-linux-amd64.jar'
   gem.files << 'lib/gluegen-rt-natives-macosx-universal.jar'
+#  gem.files << 'lib/gluegen-rt-natives-ios-arm64.jar'
   gem.files << 'lib/gluegen-rt-natives-windows-amd64.jar'
   gem.files << 'lib/jogl-all-natives-linux-amd64.jar'
   gem.files << 'lib/jogl-all-natives-macosx-universal.jar'
+#  gem.files << 'lib/jogl-all-natives-ios-arm64.jar'
   gem.files << 'lib/jogl-all-natives-windows-amd64.jar'
+  gem.files << 'library/pdf/itextpdf-5.5.13.2.jar'
+  gem.files << 'library/svg/batik-all-1.14.jar'
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.add_development_dependency 'jruby-openssl', '~> 0.1.0', '>=0.1.3'
+  gem.add_development_dependency 'jruby-openssl', '~> 0.10', '>=0.10.5'
   gem.add_development_dependency 'minitest', '~> 5.14'
-  gem.add_runtime_dependency 'rake', '~> 12.3'
+  gem.add_runtime_dependency 'rake', '~> 13.0'
   gem.add_runtime_dependency 'arcball', '~> 1.0', '>= 1.0.2'
   gem.require_paths = ['lib']
   gem.platform      = 'java'

data/src/main/java/monkstone/FastNoiseModuleJava.java

@@ -0,0 +1,127 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package monkstone;
+
+import monkstone.noise.OpenSimplex2F;
+import org.jruby.Ruby;
+import org.jruby.RubyFixnum;
+import org.jruby.RubyFloat;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.anno.JRubyModule;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+
+/**
+ *
+ * @author Martin Prout
+ */
+@JRubyModule(name = "FastNoise")
+public class FastNoiseModuleJava {
+
+    static OpenSimplex2F ng = new OpenSimplex2F(System.currentTimeMillis());
+
+    /**
+     *
+     * @param runtime Ruby
+     */
+    public static void createNoiseModule(Ruby runtime) {
+        RubyModule noiseModule = runtime.defineModule("FastNoise");
+        noiseModule.defineAnnotatedMethods(FastNoiseModuleJava.class);
+    }
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of numeric values
+     * @return mapped value RubyFloat
+     */
+    @JRubyMethod(name = "tnoise", rest = true, module = true)
+    public static IRubyObject terrainNoiseImpl(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        double result = 0;
+        double one;
+        double two;
+        double three;
+        double four;
+        switch (args.length) {
+            case 2:
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2_XBeforeY(one, two);
+                break;
+            case 3:
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise3_XYBeforeZ(one, two, three);
+                break;
+            case 4:
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise4_XYBeforeZW(one, two, three, four);
+                break;
+            default:
+                throw new RuntimeException("Min 2D Max 4D Noise");
+        }
+        return RubyFloat.newFloat(context.runtime, result);
+    }
+
+    /**
+     *
+     * @param context ThreadContext
+     * @param recv IRubyObject
+     * @param args array of numeric values
+     * @return mapped value RubyFloat
+     */
+    @JRubyMethod(name = "noise", rest = true, module = true)
+    public static IRubyObject noiseImpl(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
+        double result = 0;
+        double one;
+        double two;
+        double three;
+        double four;
+        switch (args.length) {
+            case 1:
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2(one, 0);
+                break;
+            case 2:
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise2(one, two);
+                break;
+            case 3:
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise3_Classic(one, two, three);
+                break;
+            case 4:
+                four = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+                three = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+                two = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+                one = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+                result = ng.noise4_Classic(one, two, three, four);
+                break;
+            default:
+                throw new RuntimeException("Maximum of 4D Noise");
+        }
+        return RubyFloat.newFloat(context.runtime, result);
+    }
+//    @JRubyMethod(name = "noise_seed", rest = true, module = true)
+//    public static IRubyObject noiseSeedImpl(ThreadContext context, IRubyObject recv, IRubyObject arg) {
+//        long seed;
+//        if (arg instanceof RubyNumeric) {
+//            seed = ((RubyNumeric) arg).getLongValue();
+//            ng = new OpenSimplex2F(seed);
+//        return RubyBoolean.newBoolean(context.runtime, true);
+//        }
+//       return RubyBoolean.newBoolean(context.runtime, false);
+//    }
+}

data/src/main/java/monkstone/MathToolModule.java

@@ -47,17 +47,17 @@ public class MathToolModule {
   */
   @JRubyMethod(name = "map1d", rest = true, module = true)
   public static IRubyObject mapOneD(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    double value = (args[0] instanceof RubyFloat)
+    double value = args[0] instanceof RubyFloat
     ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
     RubyRange r1 = (RubyRange) args[1];
     RubyRange r2 = (RubyRange) args[2];
-    double first1 = (r1.first(context) instanceof RubyFloat)
+    double first1 = r1.first(context) instanceof RubyFloat
     ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
-    double first2 = (r2.first(context) instanceof RubyFloat)
+    double first2 = r2.first(context) instanceof RubyFloat
     ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
-    double last1 = (r1.last(context) instanceof RubyFloat)
+    double last1 = r1.last(context) instanceof RubyFloat
     ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
-    double last2 = (r2.last(context) instanceof RubyFloat)
+    double last2 = r2.last(context) instanceof RubyFloat
     ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
     return mapMt(context, value, first1, last1, first2, last2);
   }
@@ -71,16 +71,16 @@ public class MathToolModule {
   */
   @JRubyMethod(name = "constrained_map", rest = true, module = true)
   public static IRubyObject constrainedMap(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double value = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
     RubyRange r1 = (RubyRange) args[1];
     RubyRange r2 = (RubyRange) args[2];
-    double first1 = (r1.first(context) instanceof RubyFloat)
+    double first1 = r1.first(context) instanceof RubyFloat
     ? ((RubyFloat) r1.first(context)).getValue() : ((RubyFixnum) r1.first(context)).getDoubleValue();
-    double first2 = (r2.first(context) instanceof RubyFloat)
+    double first2 = r2.first(context) instanceof RubyFloat
     ? ((RubyFloat) r2.first(context)).getValue() : ((RubyFixnum) r2.first(context)).getDoubleValue();
-    double last1 = (r1.last(context) instanceof RubyFloat)
+    double last1 = r1.last(context) instanceof RubyFloat
     ? ((RubyFloat) r1.last(context)).getValue() : ((RubyFixnum) r1.last(context)).getDoubleValue();
-    double last2 = (r2.last(context) instanceof RubyFloat)
+    double last2 = r2.last(context) instanceof RubyFloat
     ? ((RubyFloat) r2.last(context)).getValue() : ((RubyFixnum) r2.last(context)).getDoubleValue();
     double max = Math.max(first1, last1);
     double min = Math.min(first1, last1);
@@ -102,11 +102,11 @@ public class MathToolModule {
   */
   @JRubyMethod(name = "p5map", rest = true, module = true)
   public static IRubyObject mapProcessing(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-    double first1 = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-    double first2 = (args[3] instanceof RubyFloat) ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
-    double last1 = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
-    double last2 = (args[4] instanceof RubyFloat) ? ((RubyFloat) args[4]).getValue() : ((RubyFixnum) args[4]).getDoubleValue();
+    double value = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double first1 = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double first2 = args[3] instanceof RubyFloat ? ((RubyFloat) args[3]).getValue() : ((RubyFixnum) args[3]).getDoubleValue();
+    double last1 = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double last2 = args[4] instanceof RubyFloat ? ((RubyFloat) args[4]).getValue() : ((RubyFixnum) args[4]).getDoubleValue();
     return mapMt(context, value, first1, last1, first2, last2);
   }
 
@@ -121,16 +121,16 @@ public class MathToolModule {
   */
   @JRubyMethod(name = "lerp", rest = true, module = true)
   public static IRubyObject lerpP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    double start = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-    double stop = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-    double amount = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double start = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double stop = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double amount = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
     if (amount <= 0) {
       return args[0];
     }
     if (amount >= 1.0) {
       return args[1];
     }
-    return context.runtime.newFloat((1 - amount) * start + (stop * amount));
+    return context.runtime.newFloat((1 - amount) * start + stop * amount);
   }
 
   /**
@@ -145,9 +145,9 @@ public class MathToolModule {
   */
   @JRubyMethod(name = "norm", rest = true, module = true)
   public static IRubyObject normP(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
-    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-    double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-    double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double value = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double start = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double stop = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
     return mapMt(context, value, start, stop, 0, 1.0);
   }
 
@@ -163,9 +163,9 @@ public class MathToolModule {
   @JRubyMethod(name = "norm_strict", rest = true, module = true)
   public static IRubyObject norm_strict(ThreadContext context, IRubyObject recv, IRubyObject[] args) {
 
-    double value = (args[0] instanceof RubyFloat) ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
-    double start = (args[1] instanceof RubyFloat) ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
-    double stop = (args[2] instanceof RubyFloat) ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
+    double value = args[0] instanceof RubyFloat ? ((RubyFloat) args[0]).getValue() : ((RubyFixnum) args[0]).getDoubleValue();
+    double start = args[1] instanceof RubyFloat ? ((RubyFloat) args[1]).getValue() : ((RubyFixnum) args[1]).getDoubleValue();
+    double stop = args[2] instanceof RubyFloat ? ((RubyFloat) args[2]).getValue() : ((RubyFixnum) args[2]).getDoubleValue();
     double max = Math.max(start, stop);
     double min = Math.min(start, stop);
     if (value < min) {
@@ -266,14 +266,14 @@ public class MathToolModule {
     int xDim = (int) args[0].toJava(Integer.class);
     int yDim =  (int) args[1].toJava(Integer.class);
     int zDim =  (int) args[2].toJava(Integer.class);
-    int xStep = (args.length > 3) ? (int) args[3].toJava(Integer.class) : 1;
-    int yStep = (args.length > 4) ? (int) args[4].toJava(Integer.class) : 1;
-    int zStep = (args.length == 6) ? (int) args[5].toJava(Integer.class) : 1;
-    int dimX = xDim / xStep;
+    int xStep = args.length > 3 ? (int) args[3].toJava(Integer.class) : 1;
+    int yStep = args.length > 4 ? (int) args[4].toJava(Integer.class) : 1;
+    int zStep = args.length == 6 ? (int) args[5].toJava(Integer.class) : 1;
+   // int dimX = xDim / xStep;
     int dimY = yDim / yStep;
     int dimZ = zDim / zStep;
     if (block.isGiven()) {
-      int count = dimX * dimY * dimZ;
+    //  int count = dimX * dimY * dimZ;
       for (int x = 0; x < xDim; x += xStep){
         for (int j = 0; j < (dimZ * dimY); j++){
           int z = j % dimZ;