diff --git a/src/Main1.hs b/src/Main1.hs index 6d3c79b..b13330b 100644 --- a/src/Main1.hs +++ b/src/Main1.hs @@ -1,10 +1,13 @@ -{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE DeriveGeneric #-} module Main where +import GHC.Generics +import Data.Aeson +import Data.Aeson.Types + import System.Environment import qualified Data.ByteString.Lazy as BS -import System.IO -import Text.JSON.Generic +import System.IO import Datatypes import Opt import JSONDeser @@ -15,7 +18,10 @@ data JSONSer = JSONSer { problemId :: Int, seed :: Int, tag :: String, solution :: String - } deriving (Show, Data, Typeable) + } deriving (Show, Generic) + +instance FromJSON JSONSer +instance ToJSON JSONSer main :: IO () main = do args <- getArgs @@ -26,7 +32,7 @@ main = do args <- getArgs commandspoints <- return (map (\(seed,game) -> strat1 game) gmseed) (commands,points) <- return $ unzip commandspoints seeds <- return ((map (\(seed, _) -> seed)) gmseed) - putStrLn . encodeJSON $ (packAll id seeds commands) + putStrLn $ show $ encode $ (packAll id seeds commands) -- print points writeFile ("scores") (scoredata id (fst $ unzip gmseed) points)