update Jython to version 2.7.2

This commit is contained in:
wyq 2020-03-23 10:40:39 +08:00
parent f7b8e2dd1f
commit 0d58fa0b70
143 changed files with 33 additions and 47 deletions

View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.python:jython-standalone:2.7.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.1/jython-standalone-2.7.1.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.1/jython-standalone-2.7.1-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.1/jython-standalone-2.7.1-sources.jar!/" />
</SOURCES>
</library>
<component name="libraryTable">
<library name="Maven: org.python:jython-standalone:2.7.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.2/jython-standalone-2.7.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.2/jython-standalone-2.7.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/python/jython-standalone/2.7.2/jython-standalone-2.7.2-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@ -30,7 +30,7 @@
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-greek:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.scilab.forge:jlatexmath-font-cyrillic:1.0.7" level="project" />
<orderEntry type="library" name="Maven: org.python:jython-standalone:2.7.1" level="project" />
<orderEntry type="library" name="Maven: org.python:jython-standalone:2.7.2" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-emf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.freehep:freehep-graphicsio-pdf:2.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-imaging:1.0-alpha1" level="project" />

View File

@ -1,40 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\ascii"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\dataframe"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\grads"/>
<Path OpenPath="D:\Run\emips\run_meic">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\micaps"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\meteo"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\array"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\test"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\weather"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\satellite\modis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\contour"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Run\emips\test"/>
<RecentFolder Folder="D:\Run\emips"/>
<RecentFolder Folder="D:\Run\emips\run_meic"/>
</Path>
<File>
<OpenedFiles>
<OpenedFile File="D:\Run\emips\run_meic\lump-VOC.py"/>
<OpenedFile File="D:\Run\emips\run_meic\run_batch.py"/>
<OpenedFile File="D:\Run\emips\run_meic\merge_sector.py"/>
<OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contour_2.py"/>
<OpenedFile File="D:\Run\emips\run_meic\test_read_nc.py"/>
</OpenedFiles>
<RecentFiles>
<RecentFile File="D:\Run\emips\run_meic\lump-VOC.py"/>
<RecentFile File="D:\Run\emips\run_meic\run_batch.py"/>
<RecentFile File="D:\Run\emips\run_meic\merge_sector.py"/>
<RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\contour\contour_2.py"/>
<RecentFile File="D:\Run\emips\run_meic\test_read_nc.py"/>
</RecentFiles>
</File>
<Font>
<TextFont FontName="YaHei Consolas Hybrid" FontSize="14"/>
</Font>
<LookFeel Name="FlatDarkLaf"/>
<Figure DoubleBuffering="false"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,693"/>
</MeteoInfo>

View File

@ -1,5 +1,5 @@
import mipylib.numeric as np
from ...core import numeric as np
def in_bounds(x, lb, ub):
"""Check if a point lies within bounds."""

View File

@ -1,7 +1,8 @@
from org.apache.commons.math3.analysis import UnivariateFunction
from org.meteoinfo.math.optimize import OptimizeUtil
from org.apache.commons.math3.fitting.leastsquares import LeastSquaresBuilder, LevenbergMarquardtOptimizer
import mipylib.numeric as np
#import mipylib.numeric as np
from ...core import numeric as np
from .common import in_bounds
def prepare_bounds(bounds, n):

Some files were not shown because too many files have changed in this diff Show More