merge 3.0 to master

MeteoInfo.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

meteoinfo-image/meteoinfo-image.iml

@@ -13,6 +13,9 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="meteoinfo-math" />
     <orderEntry type="module" module-name="meteoinfo-ndarray" />
+    <orderEntry type="module" module-name="meteoinfo-common" />
+    <orderEntry type="module" module-name="meteoinfo-math" />
+    <orderEntry type="module" module-name="meteoinfo-ndarray" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="module" module-name="meteoinfo-common" />

meteoinfo-lab/meteoinfo-lab.iml

@@ -21,6 +21,11 @@
         <jarDirectory url="file://$MODULE_DIR$/../../toolbox/miml_dev/miml/lib" recursive="false" />
       </library>
     </orderEntry>
+    <orderEntry type="module" module-name="meteoinfo-math" />
+    <orderEntry type="module" module-name="meteoinfo-ndarray" />
+    <orderEntry type="module" module-name="meteoinfo-table" />
+    <orderEntry type="module" module-name="meteoinfo-image" />
+    <orderEntry type="module" module-name="meteoinfo-common" />
     <orderEntry type="module" module-name="meteoinfo-chart" />
     <orderEntry type="module" module-name="meteoinfo-geo" />
     <orderEntry type="module" module-name="meteoinfo-math" />

meteoinfo-lab/milconfig.xml

@@ -22,13 +22,11 @@
       <OpenedFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot_cuace_3d_particles_relief.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\image\gray_scale.py"/>
       <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
-      <OpenedFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_iris.py"/>
     </OpenedFiles>
     <RecentFiles>
       <RecentFile File="D:\Working\MIScript\Jython\mis\plot_types\3d\jogl\plot_cuace_3d_particles_relief.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\image\gray_scale.py"/>
       <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\cluster\dbscan_1.py"/>
-      <RecentFile File="D:\Working\MIScript\Jython\mis\toolbox\miml\deep_learning\classification\classifer_iris.py"/>
     </RecentFiles>
   </File>
   <Font>

meteoinfo-math/meteoinfo-math.iml

@@ -12,6 +12,8 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="meteoinfo-ndarray" />
+    <orderEntry type="module" module-name="meteoinfo-common" />
+    <orderEntry type="module" module-name="meteoinfo-ndarray" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-math3:3.6.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="module" module-name="meteoinfo-common" />

meteoinfo-ndarray/meteoinfo-ndarray.iml

@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="meteoinfo-common" />
+    <orderEntry type="module" module-name="meteoinfo-common" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />

meteoinfo-table/meteoinfo-table.iml

@@ -13,6 +13,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="meteoinfo-ndarray" />
     <orderEntry type="module" module-name="meteoinfo-common" />
+    <orderEntry type="module" module-name="meteoinfo-ndarray" />
+    <orderEntry type="module" module-name="meteoinfo-common" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />