X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.pythonlink%2Fscl%2FPython.scl;h=5fc78318e62b88ce0f7fee4ed2b539613abec558;hb=refs%2Fchanges%2F16%2F316%2F1;hp=b1ca052ef2b026c3a3f00ebdcf05b2784e3962d8;hpb=35382d886800c915bbdcfd595cf7b8401413377f;p=simantics%2Fpython.git

diff --git a/org.simantics.pythonlink/scl/Python.scl b/org.simantics.pythonlink/scl/Python.scl
index b1ca052..5fc7831 100644
--- a/org.simantics.pythonlink/scl/Python.scl
+++ b/org.simantics.pythonlink/scl/Python.scl
@@ -1,5 +1,3 @@
-import "Vector"
-
 effect Python
     "Simantics/Python/Python"
     "org.simantics.pythonlink.PythonContext"
@@ -36,6 +34,27 @@ importJava "org.simantics.pythonlink.NDArray" where
     @JavaName equals
     ndarrayEquals :: NDArray -> NDArray -> Boolean
 
+class NDArrayInput a where
+    ndarrayInput :: a -> ([Integer], [Double])
+    
+instance NDArrayInput [Double] where
+    ndarrayInput v = ([length v], v)
+    
+instance (NDArrayInput [a]) => NDArrayInput [[a]] where
+    ndarrayInput v = let
+        inp = map ndarrayInput v
+        dims = map fst inp
+        vals = join $ map snd inp
+      in
+        if not (all (== (dims!0)) dims) then
+            fail "List of lists not of uniform dimension"
+          else
+            ([length v] + (dims!0), vals)
+
+ndarrayFromList :: NDArrayInput a => a -> NDArray
+ndarrayFromList v = ndarrayN (vector dims) (vector vals) where
+    (dims, vals) = ndarrayInput v
+
 instance Show NDArray where
     show = ndarrayToString
 
@@ -50,22 +69,35 @@ importJava "org.simantics.pythonlink.PythonContext" where
     
     executePythonStatement :: String -> <Python> ()
     
+    setPythonBooleanVariable :: String -> Boolean -> <Python> ()
     setPythonIntegerVariable :: String -> Integer -> <Python> ()
-    setPythonIntegerArrayVariable :: String -> Vector Integer -> <Python> ()
+    setPythonLongVariable :: String -> Long -> <Python> ()
     setPythonDoubleVariable :: String -> Double -> <Python> ()
-    setPythonDoubleArrayVariable :: String -> Vector Double -> <Python> ()
     setPythonStringVariable :: String -> String -> <Python> ()
+    
+    setPythonBooleanArrayVariable :: String -> Vector Boolean -> <Python> ()
+    setPythonIntegerArrayVariable :: String -> Vector Integer -> <Python> ()
+    setPythonLongArrayVariable :: String -> Vector Long -> <Python> ()
+    setPythonDoubleArrayVariable :: String -> Vector Double -> <Python> ()
     setPythonStringArrayVariable :: String -> Vector String -> <Python> ()
     setPythonNDArrayVariable :: String -> NDArray -> <Python> ()
     
+    getPythonBooleanVariable :: String -> <Python> Boolean
     getPythonIntegerVariable :: String -> <Python> Integer
-    getPythonIntegerArrayVariable :: String -> <Python> Vector Integer
+    getPythonLongVariable :: String -> <Python> Long
     getPythonDoubleVariable :: String -> <Python> Double
-    getPythonDoubleArrayVariable :: String -> <Python> Vector Double
     getPythonStringVariable :: String -> <Python> String
+    
+    getPythonBooleanArrayVariable :: String -> <Python> Vector Boolean
+    getPythonIntegerArrayVariable :: String -> <Python> Vector Integer
+    getPythonLongArrayVariable :: String -> <Python> Vector Long
+    getPythonDoubleArrayVariable :: String -> <Python> Vector Double
     getPythonStringArrayVariable  :: String -> <Python> Vector String
     getPythonNDArrayVariable :: String -> <Python> NDArray
     
+    setPythonVariantVariable :: String -> Variant -> <Python> ()
+    getPythonVariantVariable :: String -> <Python> Variant
+
 importJava "org.simantics.pythonlink.Python" where
     openPythonContext :: <Proc> PythonContext